aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-09-06 22:09:37 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-09-06 22:09:37 +0000
commitf210c74398d1dab7ed4affb489003f4c83256794 (patch)
tree0fcedbd25d24bdf13cef42a00c11fd8715879fe0 /src/wallet.cpp
parent9631ac12148541ce7b57e5a7d7ffa72999b18c2d (diff)
parentc1124277c5711ded556ea98b0eed1fb7b9081c8d (diff)
downloadbitcoin-f210c74398d1dab7ed4affb489003f4c83256794.tar.xz
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 9ce80e7044..b828473dfe 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1149,7 +1149,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)