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)
8 years ago · e43a58514d
1 changed files with 1 additions and 1 deletions
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
				@@ -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))
        {