highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 23:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gavin Andresen
2011-11-20 10:39:01 -05:00
parent 1c15f88653
commit b2d3b2d65d
3 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet.cpp
View File

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