lib/model: No watch-error on missing folder (fixes syncthing#5833) (syncthing#5876)

imsodin · calmh · commit b5b54ff0572d · 2019-07-19T19:41:16.000+02:00
diff --git a/lib/model/model.go b/lib/model/model.go
@@ -2242,7 +2242,7 @@ func (m *model) WatchError(folder string) error {
 	m.fmut.RLock()
 	defer m.fmut.RUnlock()
 	if err := m.checkFolderRunningLocked(folder); err != nil {
-		return err
+		return nil // If the folder isn't running, there's no error to report.
 	}
 	return m.folderRunners[folder].WatchError()
 }

Original file line number	Diff line number	Diff line change
`@@ -2242,7 +2242,7 @@ func (m *model) WatchError(folder string) error {`
`2242`	`2242`	`m.fmut.RLock()`
`2243`	`2243`	`defer m.fmut.RUnlock()`
`2244`	`2244`	`if err := m.checkFolderRunningLocked(folder); err != nil {`
`2245`		`- return err`
	`2245`	`+ return nil // If the folder isn't running, there's no error to report.`
`2246`	`2246`	`}`
`2247`	`2247`	`return m.folderRunners[folder].WatchError()`
`2248`	`2248`	`}`