From b917555b04b501efe22990eedadc59ae8baa2519 Mon Sep 17 00:00:00 2001
From: Ashley Holman <dscvlt@gmail.com>
Date: Fri, 6 Jun 2014 02:24:59 -0500
Subject: qt: PeerTableModel: Fix potential deadlock. #4296

---
 src/qt/peertablemodel.cpp | 4 ++--
 1 file 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)
-- 
cgit v1.2.3