diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-16 10:25:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-16 10:30:33 +0100 |
| commit | e43a58514dd38dacd930aa4c94afb998d4360183 (patch) | |
| tree | 47d9aedeed5b0d69ec6e908552dfc077b67b38a9 | |
| parent | f8af89a9182059929bf8a6facd45478f90dd9b25 (diff) | |
| parent | 07afcd6379bb46ace5856f6a47a9188cf9aed2ea (diff) | |
| download | bitcoin-e43a58514dd38dacd930aa4c94afb998d4360183.tar.xz | |
Merge #9771: Add missing cs_wallet lock that triggers new lock held assertion
07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
| -rw-r--r-- | src/wallet/walletdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 106a59d562..81fdde401e 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) bool fNoncriticalErrors = false; DBErrors result = DB_LOAD_OK; + LOCK(pwallet->cs_wallet); try { - LOCK(pwallet->cs_wallet); int nMinVersion = 0; if (Read((string)"minversion", nMinVersion)) { |