aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Vasin <rat4vier@gmail.com>2014-06-20 16:32:57 +0400
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-18 15:34:28 +0200
commit0a6dcae50827fd4dd8cb1874936b2ca136232c6e (patch)
treea1675853e7ca6b59788c9d2273fdeb79fc7242ce
parent44d8e093caf633c2a307e917a1096bf7c7cf867e (diff)
downloadbitcoin-0a6dcae50827fd4dd8cb1874936b2ca136232c6e.tar.xz
AvailableCoins: acquire cs_main mutex
It's required when called from WalletModel Rebased-From: ea3acaf
-rw-r--r--src/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index fa7aecddb6..bc132ad046 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1012,7 +1012,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
vCoins.clear();
{
- LOCK(cs_wallet);
+ LOCK2(cs_main, cs_wallet);
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{
const uint256& wtxid = it->first;