octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show restart prompt when changing folder label (fixes #2840)

Browse Source
This commit is contained in:
Jakob Borg 2016-03-16 12:16:38 +01:00
parent d8fba47870
commit 17517bcc3d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/config.go
View File

@ -209,10 +209,14 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
// Ensure that any loose devices are not present in the wrong places // Ensure that any loose devices are not present in the wrong places
// Ensure that there are no duplicate devices // Ensure that there are no duplicate devices
// Ensure that puller settings are sane // Ensure that puller settings are sane
// Ensure that the versioning configuration parameter map is not nil
for i := range cfg.Folders { for i := range cfg.Folders {
cfg.Folders[i].Devices = ensureDevicePresent(cfg.Folders[i].Devices, myID) cfg.Folders[i].Devices = ensureDevicePresent(cfg.Folders[i].Devices, myID)
cfg.Folders[i].Devices = ensureExistingDevices(cfg.Folders[i].Devices, existingDevices) cfg.Folders[i].Devices = ensureExistingDevices(cfg.Folders[i].Devices, existingDevices)
cfg.Folders[i].Devices = ensureNoDuplicateFolderDevices(cfg.Folders[i].Devices) cfg.Folders[i].Devices = ensureNoDuplicateFolderDevices(cfg.Folders[i].Devices)
if cfg.Folders[i].Versioning.Params == nil {
cfg.Folders[i].Versioning.Params = map[string]string{}
}
sort.Sort(FolderDeviceConfigurationList(cfg.Folders[i].Devices)) sort.Sort(FolderDeviceConfigurationList(cfg.Folders[i].Devices))
} }

4
lib/model/model.go
View File

@ -1942,9 +1942,11 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
} }
} }
// Check if anything else differs, apart from the device list. // Check if anything else differs, apart from the device list and label.
fromCfg.Devices = nil fromCfg.Devices = nil
toCfg.Devices = nil toCfg.Devices = nil
fromCfg.Label = ""
toCfg.Label = ""
if !reflect.DeepEqual(fromCfg, toCfg) { if !reflect.DeepEqual(fromCfg, toCfg) {
l.Debugln(m, "requires restart, folder", folderID, "configuration differs") l.Debugln(m, "requires restart, folder", folderID, "configuration differs")
return false return false