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

lib/model: Fix lock order

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3823
This commit is contained in:
AudriusButkevicius 2016-12-21 12:22:18 +00:00 committed by Jakob Borg
parent 5c067661f4
commit aa3ef49dd7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/model/model.go
View File

@ -1347,10 +1347,11 @@ func (m *Model) AddConnection(conn connections.Connection, hello protocol.HelloR
l.Infof(`Device %s client is "%s %s" named "%s"`, deviceID, hello.ClientName, hello.ClientVersion, hello.DeviceName) l.Infof(`Device %s client is "%s %s" named "%s"`, deviceID, hello.ClientName, hello.ClientVersion, hello.DeviceName)
conn.Start() conn.Start()
m.pmut.Unlock()
// Acquires fmut, so has to be done outside of pmut.
cm := m.generateClusterConfig(deviceID) cm := m.generateClusterConfig(deviceID)
conn.ClusterConfig(cm) conn.ClusterConfig(cm)
m.pmut.Unlock()
device, ok := m.cfg.Devices()[deviceID] device, ok := m.cfg.Devices()[deviceID]
if ok && (device.Name == "" || m.cfg.Options().OverwriteRemoteDevNames) { if ok && (device.Name == "" || m.cfg.Options().OverwriteRemoteDevNames) {