diff options
author | Simon Frei <freisim93@gmail.com> | 2017-10-26 11:49:06 +0000 |
---|---|---|
committer | Jakob Borg <jakob@kastelo.net> | 2017-10-26 13:50:30 +0200 |
commit | 2953fe40d13f3ddced0dd9f30a06823831a15a64 (patch) | |
tree | f7086e24d3f922e26b6bd17a34d32b1d2903ab1d | |
parent | ff0a83fe5b6721bce13eb80abb7339c33cb771fb (diff) | |
download | syncthing-0.14.40-rc.3.tar.gz syncthing-0.14.40-rc.3.zip |
lib/model: Add initial noop watch cancel func (fixes #4464)v0.14.40-rc.3
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4465
-rw-r--r-- | lib/model/folder.go | 1 | ||||
-rw-r--r-- | lib/model/rofolder.go | 2 | ||||
-rw-r--r-- | lib/model/rwfolder.go | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/model/folder.go b/lib/model/folder.go index f3874edc2..ce7459e9f 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -40,6 +40,7 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder { cancel: cancel, model: model, initialScanFinished: make(chan struct{}), + watchCancel: func() {}, } } diff --git a/lib/model/rofolder.go b/lib/model/rofolder.go index 7a665776e..b7a567102 100644 --- a/lib/model/rofolder.go +++ b/lib/model/rofolder.go @@ -34,7 +34,7 @@ func (f *sendOnlyFolder) Serve() { f.scan.timer.Stop() }() - if f.FSWatcherEnabled { + if f.FSWatcherEnabled && f.CheckHealth() == nil { f.startWatch() } diff --git a/lib/model/rwfolder.go b/lib/model/rwfolder.go index 793d6448b..e524354f5 100644 --- a/lib/model/rwfolder.go +++ b/lib/model/rwfolder.go @@ -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() } |