Browse Source

Update CWallet::LoadWallet for proper return type.

pull/1/head
Jeff Garzik 11 years ago committed by Jeff Garzik
parent
commit
116df55e21
  1. 3
      src/db.h
  2. 6
      src/wallet.cpp
  3. 2
      src/wallet.h

3
src/db.h

@ -346,7 +346,8 @@ enum DBErrors @@ -346,7 +346,8 @@ enum DBErrors
{
DB_LOAD_OK,
DB_CORRUPT,
DB_TOO_NEW
DB_TOO_NEW,
DB_LOAD_FAIL,
};
class CWalletDB : public CDB

6
src/wallet.cpp

@ -1122,7 +1122,7 @@ string CWallet::SendMoneyToBitcoinAddress(string strAddress, int64 nValue, CWall @@ -1122,7 +1122,7 @@ string CWallet::SendMoneyToBitcoinAddress(string strAddress, int64 nValue, CWall
bool CWallet::LoadWallet(bool& fFirstRunRet)
int CWallet::LoadWallet(bool& fFirstRunRet)
{
if (!fFileBacked)
return false;
@ -1139,11 +1139,11 @@ bool CWallet::LoadWallet(bool& fFirstRunRet) @@ -1139,11 +1139,11 @@ bool CWallet::LoadWallet(bool& fFirstRunRet)
SetDefaultKey(GetOrReuseKeyFromPool());
if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), ""))
return false;
return DB_LOAD_FAIL;
}
CreateThread(ThreadFlushWalletDB, &strWalletFile);
return true;
return DB_LOAD_OK;
}

2
src/wallet.h

@ -167,7 +167,7 @@ public: @@ -167,7 +167,7 @@ public:
walletdb.WriteBestBlock(loc);
}
bool LoadWallet(bool& fFirstRunRet);
int LoadWallet(bool& fFirstRunRet);
// bool BackupWallet(const std::string& strDest);
// requires cs_mapAddressBook lock

Loading…
Cancel
Save