aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2014-01-29 13:49:15 -0800
committerGavin Andresen <[email protected]>2014-01-29 13:49:15 -0800
commit3581abdd460b3ffc2ceb645bfd53797eedd629d5 (patch)
tree42443ed33e586be5fc096c50a9a71773fe1044a7 /src/init.cpp
parentRe-add BTC/KB in help message for `settxfee` (diff)
parentPrepare block connection logic for headers-first. (diff)
downloaddiscoin-3581abdd460b3ffc2ceb645bfd53797eedd629d5.tar.xz
discoin-3581abdd460b3ffc2ceb645bfd53797eedd629d5.zip
Merge pull request #3370 from sipa/headersfirst3
Prepare block connection logic for headers-first
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 7213477b2..8520d63c8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -983,7 +983,7 @@ bool AppInit2(boost::thread_group& threadGroup)
// scan for better chains in the block chain database, that are not yet connected in the active best chain
CValidationState state;
- if (!ConnectBestBlock(state))
+ if (!ActivateBestChain(state))
strErrors << "Failed to connect best block";
std::vector<boost::filesystem::path> vImportFiles;