Merge pull request #4558 from birarda/master

fix deadlock opportunity in killNodeWithUUID
This commit is contained in:
Brad Hefta-Gaub 2015-03-31 17:00:50 -07:00
commit 90498969e2

View file

@ -392,8 +392,9 @@ void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
_nodeMutex.unlock();
QWriteLocker writeLocker(&_nodeMutex);
_nodeMutex.lockForWrite();
_nodeHash.unsafe_erase(it);
_nodeMutex.unlock();
handleNodeKill(matchingNode);
} else {