Merge pull request #4297

b917555 qt: PeerTableModel: Fix potential deadlock. #4296 (Ashley Holman)

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)