diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-01 12:44:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-01 12:44:26 +0100 |
| commit | 89151d9f29870cc9246f76baba75b75d3a7528d7 (patch) | |
| tree | dea46798311c69b9eca01eaff249f10a302ae691 /src | |
| parent | 0ddf4416cc8011d788494a0539ccb687cdb03f3d (diff) | |
| parent | 43422a0121b4d34fac268eacd7fbd9ead8e73efd (diff) | |
| download | bitcoin-89151d9f29870cc9246f76baba75b75d3a7528d7.tar.xz | |
Merge pull request #5390
43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 000a088b97..27dbf61c2b 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) { |