mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-26 01:31:30 -05:00
fixed deadlock (found by Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7290 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
33abca82e5
commit
bce35d26e3
@ -1004,8 +1004,6 @@ void p3ServiceControl::updatePeerNew(const RsPeerId &peerId)
|
||||
|
||||
void p3ServiceControl::updatePeerRemoved(const RsPeerId &peerId)
|
||||
{
|
||||
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
|
||||
|
||||
#ifdef SERVICECONTROL_DEBUG
|
||||
std::cerr << "p3ServiceControl::updatePeerRemoved(): " << peerId.toStdString();
|
||||
std::cerr << std::endl;
|
||||
@ -1013,6 +1011,8 @@ void p3ServiceControl::updatePeerRemoved(const RsPeerId &peerId)
|
||||
|
||||
removePeer(peerId);
|
||||
|
||||
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
|
||||
|
||||
pqiServicePeer peer;
|
||||
peer.id = peerId;
|
||||
peer.actions = RS_SERVICE_PEER_REMOVED;
|
||||
|
Loading…
x
Reference in New Issue
Block a user