浏览代码

lib/model: Don't lower rescan interval from default on auto accepted enc folder (fixes #8572) (#8573)

Aleksey Vasenev 3 年之前
父节点
当前提交
f9d68474ac
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      lib/model/model.go

+ 6 - 1
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 {