Merge pull request #5390

43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
2014-12-01 12:44:21 +01:00 · 2014-12-01 12:44:21 +01:00 · 89151d9f29
parent 0ddf4416cc 43422a0121
commit 89151d9f29
1 changed files with 1 additions and 1 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@ -2030,7 +2030,7 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()

 set<CTxDestination> CWallet::GetAccountAddresses(string strAccount) const
 {
-    AssertLockHeld(cs_wallet); // mapWallet
+    LOCK(cs_wallet);
    set<CTxDestination> result;
    BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, mapAddressBook)
    {