diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-29 05:56:57 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-29 06:06:57 +0200 |
| commit | bf3a5dd7f0c9da14da1ebcef49d4eeff5fe14419 (patch) | |
| tree | 4012442be778f55be17e7807399e7e00a8a8837a /src/init.cpp | |
| parent | a38eaea082692d0dac6996dcace2084cd7f29179 (diff) | |
| parent | e8b5f0d549b1b76611c7374bed9ceec7d09fa847 (diff) | |
| download | bitcoin-bf3a5dd7f0c9da14da1ebcef49d4eeff5fe14419.tar.xz | |
Merge pull request #4796
e8b5f0d Move CBlockIndex, CChain and related code out of main (jtimon)
6db83db Decouple CChain from mapBlockIndex (jtimon)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 27594ecbe3..85f4d360d2 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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(); } |