Only remove database log files on shutdown after wallet encryption/rewrite

[novacoin.git] / src / wallet.cpp

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 9b9586f..737f0e6 100644 (file)
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -194,8 +194,8 @@ bool CWallet::EncryptWallet(const string& strWalletPassphrase)
 
         // Need to completely rewrite the wallet file; if we don't, bdb might keep
         // bits of the unencrypted private key in slack space in the database file.
-        setKeyPool.clear();
-        CDB::Rewrite(strWalletFile);
+        if (CDB::Rewrite(strWalletFile))
+            RemoveLogFilesOnShutdown(true);
     }
 
     return true;
@@ -1134,6 +1134,7 @@ int CWallet::LoadWallet(bool& fFirstRunRet)
     {
         if (CDB::Rewrite(strWalletFile, "\x04pool"))
         {
+            RemoveLogFilesOnShutdown(true);
             setKeyPool.clear();
             // Note: can't top-up keypool here, because wallet is locked.
             // User will be prompted to unlock wallet the next operation