diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-12 19:34:30 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-12 19:34:30 -0700 |
| commit | 0fa89d8e816807a621419495d7bdc6366979a0f0 (patch) | |
| tree | 32327a402bb77104f74738c2a10022c8938db252 /src/wallet.cpp | |
| parent | 61e3c011f5506b4ebd0014e49ea8b61ae916d20d (diff) | |
| parent | 7ec552676c66488fe00fb503d02ec4a389a715b7 (diff) | |
| download | bitcoin-0fa89d8e816807a621419495d7bdc6366979a0f0.tar.xz | |
Merge pull request #381 from TheBlueMatt/nminversion
Add minversion to wallet.
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 93313e7b27..a211fde468 100644 --- 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)) |