Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed deadlock (found by Phenom)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7290 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-21 08:22:58 +00:00
parent 33abca82e5
commit bce35d26e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/pqi/p3servicecontrol.cc
View File

@ -1004,8 +1004,6 @@ void p3ServiceControl::updatePeerNew(const RsPeerId &peerId)
void p3ServiceControl::updatePeerRemoved(const RsPeerId &peerId) void p3ServiceControl::updatePeerRemoved(const RsPeerId &peerId)
{ {
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
#ifdef SERVICECONTROL_DEBUG #ifdef SERVICECONTROL_DEBUG
std::cerr << "p3ServiceControl::updatePeerRemoved(): " << peerId.toStdString(); std::cerr << "p3ServiceControl::updatePeerRemoved(): " << peerId.toStdString();
std::cerr << std::endl; std::cerr << std::endl;
@ -1013,6 +1011,8 @@ void p3ServiceControl::updatePeerRemoved(const RsPeerId &peerId)
removePeer(peerId); removePeer(peerId);
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
pqiServicePeer peer; pqiServicePeer peer;
peer.id = peerId; peer.id = peerId;
peer.actions = RS_SERVICE_PEER_REMOVED; peer.actions = RS_SERVICE_PEER_REMOVED;