From 1b10607def5a5d59b8b7b2a1067b4d30f943fa46 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 11 Oct 2018 11:33:21 +0200 Subject: [PATCH] lib/model: Don't check folder health if there is nothing to pull (fixes #2497) (#5255) --- lib/model/folder_sendrecv.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go index d4c168eff..22ebf9108 100644 --- a/lib/model/folder_sendrecv.go +++ b/lib/model/folder_sendrecv.go @@ -141,11 +141,6 @@ func (f *sendReceiveFolder) pull() bool { return true } - if err := f.CheckHealth(); err != nil { - l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err) - return true - } - f.model.fmut.RLock() curIgnores := f.model.folderIgnores[f.folderID] folderFiles := f.model.folderFiles[f.folderID] @@ -161,6 +156,11 @@ func (f *sendReceiveFolder) pull() bool { return true } + if err := f.CheckHealth(); err != nil { + l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err) + return true + } + curIgnoreHash := curIgnores.Hash() ignoresChanged := curIgnoreHash != f.prevIgnoreHash