From 35f40e9a58322defcdb95e38ec99fcf888ffa8ca Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 23 Jul 2019 20:39:25 +0200 Subject: [PATCH] lib/model: Create new file-set after stopping folder (fixes #5882) (#5883) --- lib/model/model.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/model/model.go b/lib/model/model.go index e5d7da3a..7e87b5ab 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -459,18 +459,16 @@ func (m *model) RestartFolder(from, to config.FolderConfiguration) { errMsg = "restarting" } - var fset *db.FileSet - if !to.Paused { - // Creating the fileset can take a long time (metadata calculation) - // so we do it outside of the lock. - fset = db.NewFileSet(to.ID, to.Filesystem(), m.db) - } - m.fmut.Lock() defer m.fmut.Unlock() m.tearDownFolderLocked(from, fmt.Errorf("%v folder %v", errMsg, to.Description())) if !to.Paused { + // Creating the fileset can take a long time (metadata calculation) + // so we do it outside of the lock. + m.fmut.Unlock() + fset := db.NewFileSet(to.ID, to.Filesystem(), m.db) + m.fmut.Lock() m.addFolderLocked(to, fset) m.startFolderLocked(to) }