change exit(1) to an assert in CWallet::EncryptWallet

This commit is contained in:
Philip Kaufmann 2014-10-01 08:50:24 +02:00
parent 870da77da6
commit d0c4197ef6
1 changed files with 4 additions and 2 deletions

View File

@ -15,6 +15,8 @@
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"
#include <assert.h>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -444,7 +446,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
} }
// We now probably have half of our keys encrypted in memory, and half not... // We now probably have half of our keys encrypted in memory, and half not...
// die and let the user reload their unencrypted wallet. // die and let the user reload their unencrypted wallet.
exit(1); assert(false);
} }
// Encryption was introduced in version 0.4.0 // Encryption was introduced in version 0.4.0
@ -456,7 +458,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
delete pwalletdbEncryption; delete pwalletdbEncryption;
// We now have keys encrypted in memory, but no on disk... // We now have keys encrypted in memory, but no on disk...
// die to avoid confusion and let the user reload their unencrypted wallet. // die to avoid confusion and let the user reload their unencrypted wallet.
exit(1); assert(false);
} }
delete pwalletdbEncryption; delete pwalletdbEncryption;