aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-12-01 12:44:21 +0100
committerWladimir J. van der Laan <[email protected]>2014-12-01 12:44:26 +0100
commit89151d9f29870cc9246f76baba75b75d3a7528d7 (patch)
treedea46798311c69b9eca01eaff249f10a302ae691 /src/wallet.cpp
parentMerge pull request #5386 (diff)
parent[Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (diff)
downloaddiscoin-89151d9f29870cc9246f76baba75b75d3a7528d7.tar.xz
discoin-89151d9f29870cc9246f76baba75b75d3a7528d7.zip
Merge pull request #5390
43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 000a088b9..27dbf61c2 100644
--- 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)
{