|
@@ -1684,7 +1684,12 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo
|
|
|
fcfg.Type = config.FolderTypeReceiveEncrypted
|
|
fcfg.Type = config.FolderTypeReceiveEncrypted
|
|
|
// Override the user-configured defaults, as normally done by the GUI
|
|
// Override the user-configured defaults, as normally done by the GUI
|
|
|
fcfg.FSWatcherEnabled = false
|
|
fcfg.FSWatcherEnabled = false
|
|
|
- fcfg.RescanIntervalS = 3600 * 24
|
|
|
|
|
|
|
+ if fcfg.RescanIntervalS != 0 {
|
|
|
|
|
+ minRescanInterval := 3600 * 24
|
|
|
|
|
+ if fcfg.RescanIntervalS < minRescanInterval {
|
|
|
|
|
+ fcfg.RescanIntervalS = minRescanInterval
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
fcfg.Versioning.Reset()
|
|
fcfg.Versioning.Reset()
|
|
|
// Other necessary settings are ensured by FolderConfiguration itself
|
|
// Other necessary settings are ensured by FolderConfiguration itself
|
|
|
} else {
|
|
} else {
|