aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorAshley Holman <dscvlt@gmail.com>2014-06-06 02:24:59 -0500
committerAshley Holman <dscvlt@gmail.com>2014-06-06 16:59:15 +0930
commitb917555b04b501efe22990eedadc59ae8baa2519 (patch)
tree52a9e74538240e0546fa421a22bf243c49005fd5 /src/qt
parent65f78a111ff52c2212cc0a423662e7a41d1206dd (diff)
downloadbitcoin-b917555b04b501efe22990eedadc59ae8baa2519.tar.xz
qt: PeerTableModel: Fix potential deadlock. #4296
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/peertablemodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index fba9d84e77..859d82f40c 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -49,8 +49,8 @@ public:
/** Pull a full list of peers from vNodes into our cache */
void refreshPeers() {
- TRY_LOCK(cs_vNodes, lockNodes);
{
+ TRY_LOCK(cs_vNodes, lockNodes);
if (!lockNodes)
{
// 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.
- TRY_LOCK(cs_main, lockMain);
{
+ TRY_LOCK(cs_main, lockMain);
if (lockMain)
{
BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats)