Fix KMD lockup on pools, try new fix electrum crash.

2019-05-16 19:33:05 +08:00
parent d624038a10
commit c2261146d9
2 changed files with 6 additions and 2 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3978,8 +3978,10 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
        if ((i == (block.vtx.size() - 1)) && (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block,pindexDelete->GetHeight()) != 0)))
        {
 #ifdef ENABLE_WALLET
-            LOCK2(cs_main, pwalletMain->cs_wallet);
-            pwalletMain->EraseFromWallet(tx.GetHash());
+            if (!fDisableWallet) {
+                LOCK(pwalletMain->cs_wallet);
+                pwalletMain->EraseFromWallet(tx.GetHash());
+            }
 #endif
        }
        else