X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fdb.cpp;h=9b67ab69df45330a1612c7f3a70053b0ae625c4c;hb=6085033f31456533ba874fa90aceebf871b0203c;hp=9d5b33ac9cc71ee51708ab39644f34f74a954b1c;hpb=9504e415cbeb128331fa4715bcccfaad6a443731;p=novacoin.git diff --git a/src/db.cpp b/src/db.cpp index 9d5b33a..9b67ab6 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -777,6 +777,13 @@ int CWalletDB::LoadWallet(CWallet* pwallet) //// todo: shouldn't we catch exceptions and try to recover and continue? CRITICAL_BLOCK(pwallet->cs_wallet) { + int nMinVersion = 0; + if (Read((string)"minversion", nMinVersion)) + { + if (nMinVersion > VERSION) + return DB_TOO_NEW; + } + // Get cursor Dbc* pcursor = GetCursor(); if (!pcursor) @@ -962,13 +969,6 @@ int CWalletDB::LoadWallet(CWallet* pwallet) if (strKey == "addrProxy") ssValue >> addrProxy; if (fHaveUPnP && strKey == "fUseUPnP") ssValue >> fUseUPnP; } - else if (strType == "minversion") - { - int nMinVersion = 0; - ssValue >> nMinVersion; - if (nMinVersion > VERSION) - return DB_TOO_NEW; - } } pcursor->close(); }