summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Vasenev <margtu-fivt@ya.ru>2022-12-22 02:52:22 +0800
committerGitHub <noreply@github.com>2022-12-21 19:52:22 +0100
commitf9d68474ac1be7378aa7bfbaf2592c94a3628a58 (patch)
treebf45fada395f85746d7da9fb294b8e226ff8ff4c
parentf0126fe1ab51416c4b58b97cdab7e54c3136d83b (diff)
lib/model: Don't lower rescan interval from default on auto accepted enc folder (fixes #8572) (#8573)
-rw-r--r--lib/model/model.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/model/model.go b/lib/model/model.go
index 97bbae2380..47fdc35e91 100644
--- 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 {