diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-22 22:55:49 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-22 22:55:49 +0000 |
| commit | 3b36da6d277c6f5ad671343e724e0336ce55c893 (patch) | |
| tree | 1e3761e0276bc4ea9b571868f61c4ae7fce7c3e6 /src/wallet.cpp | |
| parent | 087fc28f7d4e82a0b79dabbaa19358e48d3084fe (diff) | |
| parent | a2de1ea2d5776289c247bbc18c1ed13e16a4169f (diff) | |
| download | bitcoin-3b36da6d277c6f5ad671343e724e0336ce55c893.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/ui.cpp
src/ui.h
src/uibase.cpp
src/xpm/about.xpm
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 3cce33608f..3ffad27e82 100644 --- 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); } |