From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 13 Jul 2011 05:07:49 +0000 (-0400)
Subject: Update CWallet::LoadWallet for proper return type.
X-Git-Tag: v0.4.0-unstable~227^2~93
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=116df55e21e5380c1cf4bccc62546757d44c1294;hp=4ea952d5c03e18b9ddd0e97f4434cd9092358dab;p=novacoin.git

Update CWallet::LoadWallet for proper return type.
---

diff --git a/src/db.h b/src/db.h
index bd8254f..049857b 100644
--- a/src/db.h
+++ b/src/db.h
@@ -346,7 +346,8 @@ enum DBErrors
 {
     DB_LOAD_OK,
     DB_CORRUPT,
-    DB_TOO_NEW
+    DB_TOO_NEW,
+    DB_LOAD_FAIL,
 };
 
 class CWalletDB : public CDB
diff --git a/src/wallet.cpp b/src/wallet.cpp
index f4df5ec..a60b0b4 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -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)
 
         SetDefaultKey(GetOrReuseKeyFromPool());
         if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), ""))
-            return false;
+            return DB_LOAD_FAIL;
     }
 
     CreateThread(ThreadFlushWalletDB, &strWalletFile);
-    return true;
+    return DB_LOAD_OK;
 }
 
 
diff --git a/src/wallet.h b/src/wallet.h
index d336d38..c19b3f4 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -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