BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4297 

b917555 qt: PeerTableModel: Fix potential deadlock. #4296 (Ashley Holman)
This commit is contained in:
Wladimir J. van der Laan 2014-06-06 10:09:09 +02:00
parent 71c0e80e7e b917555b04
commit 345cb52e8b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/peertablemodel.cpp
View File

@ -49,8 +49,8 @@ public:
/** Pull a full list of peers from vNodes into our cache */ /** Pull a full list of peers from vNodes into our cache */
void refreshPeers() { void refreshPeers() {
TRY_LOCK(cs_vNodes, lockNodes);
{ {
TRY_LOCK(cs_vNodes, lockNodes);
if (!lockNodes) if (!lockNodes)
{ {
// skip the refresh if we can't immediately get the lock // skip the refresh if we can't immediately get the lock
@ -70,8 +70,8 @@ public:
} }
// if we can, retrieve the CNodeStateStats for each node. // if we can, retrieve the CNodeStateStats for each node.
TRY_LOCK(cs_main, lockMain);
{ {
TRY_LOCK(cs_main, lockMain);
if (lockMain) if (lockMain)
{ {
BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats) BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats)