git://git.novaco.in
/
novacoin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge branch '0.4.x' into 0.5.x
[novacoin.git]
/
src
/
wallet.cpp
diff --git
a/src/wallet.cpp
b/src/wallet.cpp
index
3cce336
..
3ffad27
100644
(file)
--- a/
src/wallet.cpp
+++ b/
src/wallet.cpp
@@
-164,7
+164,8
@@
bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
if (fFileBacked)
{
pwalletdbEncryption = new CWalletDB(strWalletFile);
- pwalletdbEncryption->TxnBegin();
+ if (!pwalletdbEncryption->TxnBegin())
+ return false;
pwalletdbEncryption->WriteMasterKey(nMasterKeyMaxID, kMasterKey);
}