diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-07 03:45:21 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-07 03:45:21 +0000 |
| commit | 8b11bff10a6bb117ff5fa06a035ee74f5390f7d6 (patch) | |
| tree | 7960a8bfd849c4ee57fa23f2b80fd9f1aa767ae5 /src/wallet.cpp | |
| parent | dd2c101336ba4fdc58d27a07bfa1dcebfac8c6fe (diff) | |
| parent | 423cece29d7990fa73d8a4b19378552258863503 (diff) | |
| download | bitcoin-8b11bff10a6bb117ff5fa06a035ee74f5390f7d6.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
bitcoin-qt.pro
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
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_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.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 e1b7e623ce..3c09f3ce3e 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1264,7 +1264,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) |