Merge branch '0.4.x' into 0.5.0.x

2026-01-21 15:50:07 +01:00 · 2012-03-03 13:59:19 -05:00
parent ef48e9b7df 88aa771536
commit 7013cc3d97
9 changed files with 87 additions and 27 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -182,7 +182,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
            if (!pwalletdbEncryption->TxnCommit())
                exit(1); //We now have keys encrypted in memory, but no on disk...die to avoid confusion and let the user reload their unencrypted wallet.

-            pwalletdbEncryption->Close();
+            delete pwalletdbEncryption;
            pwalletdbEncryption = NULL;
        }