diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-06 23:14:53 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-06 23:14:53 +0000 |
| commit | 3b5c5b817f2a4c179fcd24ac10c5a3d505b40c03 (patch) | |
| tree | 60f22792075c69724371fbd021d96ca876fc7f24 /src/wallet.cpp | |
| parent | 17c94ea886e8c25b398a0effbb84b5f3a4fdd08a (diff) | |
| parent | fc1cd74b86f45b292b129b9b689d2d778287c855 (diff) | |
| download | bitcoin-3b5c5b817f2a4c179fcd24ac10c5a3d505b40c03.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 65cf1544c8..f0a3066471 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1255,7 +1255,7 @@ string CWallet::SendMoneyToBitcoinAddress(const CBitcoinAddress& address, int64 int CWallet::LoadWallet(bool& fFirstRunRet) { if (!fFileBacked) - return false; + return DB_LOAD_OK; fFirstRunRet = false; int nLoadWalletRet = CWalletDB(strWalletFile,"cr+").LoadWallet(this); if (nLoadWalletRet == DB_NEED_REWRITE) |