lib/model: Don't lower rescan interval from default on auto accepted …

…enc folder (fixes #8572) (#8573)
syncthing · Dec 21, 2022 · f9d6847 · f9d6847
1 parent f0126fe
commit f9d6847
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/model/model.go b/lib/model/model.go
@@ -1684,7 +1684,12 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo
 				fcfg.Type = config.FolderTypeReceiveEncrypted
 				// Override the user-configured defaults, as normally done by the GUI
 				fcfg.FSWatcherEnabled = false
-				fcfg.RescanIntervalS = 3600 * 24
+				if fcfg.RescanIntervalS != 0 {
+					minRescanInterval := 3600 * 24
+					if fcfg.RescanIntervalS < minRescanInterval {
+						fcfg.RescanIntervalS = minRescanInterval
+					}
+				}
 				fcfg.Versioning.Reset()
 				// Other necessary settings are ensured by FolderConfiguration itself
 			} else {