aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-11-20 10:39:01 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2011-11-20 13:52:59 -0500
commit76ef6d89b98b57d2ee5c6db993cd1cc375dd3726 (patch)
tree7b0dd4a0c8e0c95ddfa4f518394c363aadbad386 /src/wallet.cpp
parentc4a3bf9e552f25a5ad0efb8cf62d344a7dad53ed (diff)
downloadbitcoin-76ef6d89b98b57d2ee5c6db993cd1cc375dd3726.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 737f0e6238..43fb6b6da3 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -194,8 +194,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;
@@ -1134,7 +1133,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