Merge pull request #5390

laanwj · laanwj · commit 89151d9f2987 · 2014-12-01T12:44:26.000+01:00
43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
diff --git 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)
     {

Original file line number	Diff line number	Diff line change
`@@ -2030,7 +2030,7 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()`
`2030`	`2030`
`2031`	`2031`	`set<CTxDestination> CWallet::GetAccountAddresses(string strAccount) const`
`2032`	`2032`	`{`
`2033`		`- AssertLockHeld(cs_wallet); // mapWallet`
	`2033`	`+ LOCK(cs_wallet);`
`2034`	`2034`	`set<CTxDestination> result;`
`2035`	`2035`	`BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, mapAddressBook)`
`2036`	`2036`	`{`