Merge pull request #5390

43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2014-12-01 12:44:21 +01:00
commit 89151d9f29
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

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