Merge pull request #4796

e8b5f0d Move CBlockIndex, CChain and related code out of main (jtimon)
6db83db Decouple CChain from mapBlockIndex (jtimon)
This commit is contained in:
Pieter Wuille 2014-09-29 05:56:57 +02:00
commit bf3a5dd7f0
No known key found for this signature in database
GPG key ID: 57896D2FF8F0B657
6 changed files with 461 additions and 442 deletions

View file

@ -1159,7 +1159,7 @@ bool AppInit2(boost::thread_group& threadGroup)
CWalletDB walletdb(strWalletFile);
CBlockLocator locator;
if (walletdb.ReadBestBlock(locator))
pindexRescan = chainActive.FindFork(locator);
pindexRescan = FindForkInGlobalIndex(chainActive, locator);
else
pindexRescan = chainActive.Genesis();
}