octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Add initial noop watch cancel func (fixes #4464)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4465
This commit is contained in:
Simon Frei 2017-10-26 11:49:06 +00:00 committed by Jakob Borg
parent 9c60bb8336
commit 4b69d0e093
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/model/folder.go
View File

@ -40,6 +40,7 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder {
cancel: cancel, cancel: cancel,
model: model, model: model,
initialScanFinished: make(chan struct{}), initialScanFinished: make(chan struct{}),
watchCancel: func() {},
} }
} }

2
lib/model/rofolder.go
View File

@ -34,7 +34,7 @@ func (f *sendOnlyFolder) Serve() {
f.scan.timer.Stop() f.scan.timer.Stop()
}() }()
if f.FSWatcherEnabled { if f.FSWatcherEnabled && f.CheckHealth() == nil {
f.startWatch() f.startWatch()
} }

2
lib/model/rwfolder.go
View File

@ -164,7 +164,7 @@ func (f *sendReceiveFolder) Serve() {
var prevSec int64 var prevSec int64
var prevIgnoreHash string var prevIgnoreHash string
if f.FSWatcherEnabled { if f.FSWatcherEnabled && f.CheckHealth() == nil {
f.startWatch() f.startWatch()
} }