Merge pull request #4668

9297763 [Qt] Add TRY_LOCK back to peertablemodel (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2014-08-11 15:06:39 +02:00
commit 3e089a00e7
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -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)