diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-06 10:09:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-06 10:13:48 +0200 |
| commit | 345cb52e8ba878ca3e2590d5792b733ec11a1f0d (patch) | |
| tree | f1506e75474b257865e0555ae99522584574b9f2 /src/qt/peertablemodel.cpp | |
| parent | 71c0e80e7e9a3be015a0e91616778698051a0785 (diff) | |
| parent | b917555b04b501efe22990eedadc59ae8baa2519 (diff) | |
| download | bitcoin-345cb52e8ba878ca3e2590d5792b733ec11a1f0d.tar.xz | |
Merge pull request #4297
b917555 qt: PeerTableModel: Fix potential deadlock. #4296 (Ashley Holman)
Diffstat (limited to 'src/qt/peertablemodel.cpp')
| -rw-r--r-- | src/qt/peertablemodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp index db5ce639b1..981d063c49 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) |