mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-23 03:18:59 +00:00
lib/model: Add initial noop watch cancel func (fixes #4464)
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4465
This commit is contained in:
parent
ff0a83fe5b
commit
2953fe40d1
@ -40,6 +40,7 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder {
|
||||
cancel: cancel,
|
||||
model: model,
|
||||
initialScanFinished: make(chan struct{}),
|
||||
watchCancel: func() {},
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ func (f *sendOnlyFolder) Serve() {
|
||||
f.scan.timer.Stop()
|
||||
}()
|
||||
|
||||
if f.FSWatcherEnabled {
|
||||
if f.FSWatcherEnabled && f.CheckHealth() == nil {
|
||||
f.startWatch()
|
||||
}
|
||||
|
||||
|
@ -164,7 +164,7 @@ func (f *sendReceiveFolder) Serve() {
|
||||
var prevSec int64
|
||||
var prevIgnoreHash string
|
||||
|
||||
if f.FSWatcherEnabled {
|
||||
if f.FSWatcherEnabled && f.CheckHealth() == nil {
|
||||
f.startWatch()
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user