Merge pull request #381 from TheBlueMatt/nminversion

Add minversion to wallet.
2011-07-12 19:34:30 -07:00
parent 61e3c011f5 7ec552676c
commit 0fa89d8e81
4 changed files with 32 additions and 9 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1130,8 +1130,9 @@ bool CWallet::LoadWallet(bool& fFirstRunRet)
    if (!fFileBacked)
        return false;
    fFirstRunRet = false;
-    if (!CWalletDB(strWalletFile,"cr+").LoadWallet(this))
-        return false;
+    int nLoadWalletRet = CWalletDB(strWalletFile,"cr+").LoadWallet(this);
+    if (nLoadWalletRet != DB_LOAD_OK)
+        return nLoadWalletRet;
    fFirstRunRet = vchDefaultKey.empty();

    if (!HaveKey(vchDefaultKey))