diff options
| author | Luke Dashjr <[email protected]> | 2012-05-22 23:07:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-05-22 23:07:46 +0000 |
| commit | a49927a46d578d142411c52b17c6f11bb19da03d (patch) | |
| tree | 90f2c7ecaee23e2e9539e9264a44c803290cff4e /src/wallet.cpp | |
| parent | Remove duplicate behavior on MacOSX (diff) | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-a49927a46d578d142411c52b17c6f11bb19da03d.tar.xz discoin-a49927a46d578d142411c52b17c6f11bb19da03d.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/bitcoinrpc.h
src/db.h
src/headers.h
src/init.cpp
src/main.cpp
src/main.h
src/noui.h
src/qt/bitcoin.cpp
src/qt/locale/bitcoin_en.ts
src/qt/walletmodel.cpp
src/script.cpp
src/ui_interface.h
src/util.cpp
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 d0684130a..d7a70fe56 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -242,7 +242,8 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (fFileBacked) { pwalletdbEncryption = new CWalletDB(strWalletFile); - pwalletdbEncryption->TxnBegin(); + if (!pwalletdbEncryption->TxnBegin()) + return false; pwalletdbEncryption->WriteMasterKey(nMasterKeyMaxID, kMasterKey); } |