fix 16034

Author: UdjinM6

src/wallet/wallet.cpp

@@ -1280,6 +1280,7 @@ void CWallet::LoadToWallet(CWalletTx& wtxIn)
     // If wallet doesn't have a chain (e.g wallet-tool), lock can't be taken.
     auto locked_chain = LockChain();
     if (locked_chain) {
+        LockAssertion lock(::cs_main);
         Optional<int> block_height = locked_chain->getBlockHeight(wtxIn.m_confirm.hashBlock);
         if (block_height) {
             // Update cached block height variable since it not stored in the
@@ -4119,7 +4120,9 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     // tx status. If lock can't be taken (e.g wallet-tool), tx confirmation
     // status may be not reliable.
     auto locked_chain = LockChain();
-    LockAssertion lock(::cs_main);
+    if (locked_chain) {
+        LockAssertion lock(::cs_main);
+    }
     LOCK(cs_wallet);
 
     fFirstRunRet = false;

src/wallet/walletdb.cpp

@@ -510,7 +510,9 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
     DBErrors result = DBErrors::LOAD_OK;
 
     auto locked_chain = pwallet->LockChain();
-    LockAssertion lock(::cs_main);
+    if (locked_chain) {
+        LockAssertion lock(::cs_main);
+    }
     LOCK(pwallet->cs_wallet);
     try {
         int nMinVersion = 0;