Never remove database files on shutdown, it caused unreadable wallets on some testers' machines.

This commit is contained in:
Gavin Andresen
2011-11-20 10:39:01 -05:00
committed by Luke Dashjr
parent c4a3bf9e55
commit 76ef6d89b9
3 changed files with 1 additions and 28 deletions

View File

@@ -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