Merge pull request #684 from rnicoll/1.8.1-dev-available-coins

AvailableCoins() now acquires cs_main lock
This commit is contained in:
langerhans 2014-08-30 16:20:38 +02:00
commit 7cf4e7e97d

View file

@ -1140,7 +1140,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;