lib/model: Also handle ServeBackground (#6173)

This commit is contained in:
Simon Frei
2019-11-22 21:30:16 +01:00
committed by GitHub
parent de886b3f22
commit 65d4dd32cb
4 changed files with 29 additions and 22 deletions

View File

@@ -317,8 +317,14 @@ func setupROFolder() (*model, *sendOnlyFolder) {
w.SetFolder(fcfg)
m := newModel(w, myID, "syncthing", "dev", db.OpenMemory(), nil)
m.ServeBackground()
// Folder should only be added, not started.
m.removeFolder(fcfg)
m.addFolder(fcfg)
m.fmut.RLock()
f := &sendOnlyFolder{
folder: folder{
stateTracker: newStateTracker(fcfg.ID, m.evLogger),
@@ -326,8 +332,7 @@ func setupROFolder() (*model, *sendOnlyFolder) {
FolderConfiguration: fcfg,
},
}
m.ServeBackground()
m.fmut.RUnlock()
return m, f
}