Merge pull request #381 from TheBlueMatt/nminversion
authorJeff Garzik <jgarzik@exmulti.com>
Wed, 13 Jul 2011 02:34:30 +0000 (19:34 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Wed, 13 Jul 2011 02:34:30 +0000 (19:34 -0700)
Add minversion to wallet.

1  2 
src/db.cpp
src/db.h
src/init.cpp
src/wallet.cpp

diff --cc src/db.cpp
Simple merge
diff --cc src/db.h
Simple merge
diff --cc src/init.cpp
Simple merge
diff --cc 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);