diff options
| author | Cozz Lovan <cozzlovan@yahoo.com> | 2014-07-13 09:33:45 +0200 |
|---|---|---|
| committer | Cozz Lovan <cozzlovan@yahoo.com> | 2014-07-13 09:33:45 +0200 |
| commit | 39cc4922fe30a93d10665d913e2e3d51fb94561a (patch) | |
| tree | f0284a8d5e2e78406bab9335f18d394a4f35308c /src/wallet.cpp | |
| parent | 29ef38951431fcce4a8692a652e99325d2a3795c (diff) | |
| download | bitcoin-39cc4922fe30a93d10665d913e2e3d51fb94561a.tar.xz | |
Fix Watchonly: cs_main lock not held
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 8fdc5f4b20..560cbc10b9 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1075,7 +1075,7 @@ int64_t CWallet::GetWatchOnlyBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -1091,7 +1091,7 @@ int64_t CWallet::GetUnconfirmedWatchOnlyBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -1106,7 +1106,7 @@ int64_t CWallet::GetImmatureWatchOnlyBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; |