octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-10 07:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Release both locks when waiting for services to stop (fixes #5028)

Browse Source
This commit is contained in:
Simon Frei 2018-06-24 17:55:28 +02:00 committed by Jakob Borg
parent c2784d76e4
commit b91ff430db
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/model.go
View File

@ -344,11 +344,13 @@ func (m *Model) tearDownFolderLocked(cfg config.FolderConfiguration) {
// Stop the services running for this folder and wait for them to finish // Stop the services running for this folder and wait for them to finish
// stopping to prevent races on restart. // stopping to prevent races on restart.
tokens := m.folderRunnerTokens[cfg.ID] tokens := m.folderRunnerTokens[cfg.ID]
m.pmut.Unlock()
m.fmut.Unlock() m.fmut.Unlock()
for _, id := range tokens { for _, id := range tokens {
m.RemoveAndWait(id, 0) m.RemoveAndWait(id, 0)
} }
m.fmut.Lock() m.fmut.Lock()
m.pmut.Lock()
// Close connections to affected devices // Close connections to affected devices
for _, dev := range cfg.Devices { for _, dev := range cfg.Devices {