From 8bb9878f267b6160ff999ce063b3ea7b28b74526 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Sun, 30 Dec 2018 21:56:16 +0100 Subject: [PATCH] lib/model: Check folder context before setting error state (#5416) --- lib/model/folder.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/model/folder.go b/lib/model/folder.go index 83f7d60c..11e3b663 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -653,6 +653,12 @@ func (f *folder) startWatchAsync(ctx context.Context, ignores *ignore.Matcher) { } func (f *folder) setError(err error) { + select { + case <-f.ctx.Done(): + return + default: + } + _, _, oldErr := f.getState() if (err != nil && oldErr != nil && oldErr.Error() == err.Error()) || (err == nil && oldErr == nil) { return