From 13a746e0fb2e58736a054e5712ff65d8b99f1213 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 11 Jun 2019 11:48:51 +0200 Subject: [PATCH] lib/model: Prevent nil deref if folder stopped (fixes #5780) (#5778) --- lib/model/model.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/model/model.go b/lib/model/model.go index 51df9879..f7296d22 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -59,8 +59,6 @@ type service interface { GetStatistics() stats.FolderStatistics getState() (folderState, time.Time, error) - setState(state folderState) - setError(err error) } type Availability struct { @@ -2072,15 +2070,6 @@ func (m *model) ScanFolders() map[string]error { errorsMut.Lock() errors[folder] = err errorsMut.Unlock() - - // Potentially sets the error twice, once in the scanner just - // by doing a check, and once here, if the error returned is - // the same one as returned by CheckHealth, though - // duplicate set is handled by setError. - m.fmut.RLock() - srv := m.folderRunners[folder] - m.fmut.RUnlock() - srv.setError(err) } wg.Done() }()