Merge pull request #4668

9297763 [Qt] Add TRY_LOCK back to peertablemodel (Cozz Lovan)
10 years ago · 3e089a00e7
parent 85af3856e7 9297763dad
commit 3e089a00e7
1 changed files with 8 additions and 2 deletions
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@ -75,8 +75,14 @@ public:
        }

        // Try to retrieve the CNodeStateStats for each node.
-        BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats)
-            stats.fNodeStateStatsAvailable = GetNodeStateStats(stats.nodeStats.nodeid, stats.nodeStateStats);
+        {
+            TRY_LOCK(cs_main, lockMain);
+            if (lockMain)
+            {
+                BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats)
+                    stats.fNodeStateStatsAvailable = GetNodeStateStats(stats.nodeStats.nodeid, stats.nodeStateStats);
+            }
+        }

        if (sortColumn >= 0)
            // sort cacheNodeStats (use stable sort to prevent rows jumping around unneceesarily)