aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-11-20 10:39:01 -0500
committerGavin Andresen <gavinandresen@gmail.com>2011-11-20 10:39:01 -0500
commitb2d3b2d65dedf3e00431e7f178a4315eb4baf47a (patch)
tree45ea76c8b6d29ffc6e3feb3832607b3f2fcafc6f /src/wallet.cpp
parent1c15f88653b0f60fe5e021192cbb81c4f193159c (diff)
downloadbitcoin-b2d3b2d65dedf3e00431e7f178a4315eb4baf47a.tar.xz
Never remove database files on shutdown, it caused unreadable wallets on some testers' machines.
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 87882a3b96..af80cc16d5 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -193,8 +193,7 @@ 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.
- if (CDB::Rewrite(strWalletFile))
- RemoveLogFilesOnShutdown(true);
+ CDB::Rewrite(strWalletFile);
}
return true;
@@ -1154,7 +1153,6 @@ 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