From: Jeff Garzik <jgarzik@exmulti.com>
Date: Wed, 13 Jul 2011 02:34:30 +0000 (-0700)
Subject: Merge pull request #381 from TheBlueMatt/nminversion
X-Git-Tag: v0.4.0-unstable~227^2~96
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=0fa89d8e816807a621419495d7bdc6366979a0f0

Merge pull request #381 from TheBlueMatt/nminversion

Add minversion to wallet.
---

0fa89d8e816807a621419495d7bdc6366979a0f0
diff --cc src/wallet.cpp
index 93313e7,ba9221f..a211fde
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@@ -1130,18 -958,20 +1130,19 @@@ bool CWallet::LoadWallet(bool& fFirstRu
      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 (!mapKeys.count(vchDefaultKey))
 +    if (!HaveKey(vchDefaultKey))
      {
 -        // Create new default key
 +        // Create new keyUser and set as default key
          RandAddSeedPerfmon();
  
 -        vchDefaultKey = GetKeyFromKeyPool();
 +        SetDefaultKey(GetOrReuseKeyFromPool());
          if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), ""))
              return false;
 -        CWalletDB(strWalletFile).WriteDefaultKey(vchDefaultKey);
      }
  
      CreateThread(ThreadFlushWalletDB, &strWalletFile);