Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-09-06 22:09:37 +00:00

View File

@@ -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)