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

2016-03-16 12:16:38 +01:00
parent d8fba47870
commit 17517bcc3d
2 changed files with 7 additions and 1 deletions
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -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
 		toCfg.Devices = nil
+		fromCfg.Label = ""
+		toCfg.Label = ""
 		if !reflect.DeepEqual(fromCfg, toCfg) {
 			l.Debugln(m, "requires restart, folder", folderID, "configuration differs")
 			return false