diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-04 12:21:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-04 12:33:21 +0200 |
| commit | f97d335942ae1a78c4898acf8640d99f4deaa6d3 (patch) | |
| tree | 133c24dcf1d2728db1e92d3f9e597ea1c9aa3079 /src/main.cpp | |
| parent | 37d83bb0a980996338d9bc9dbdbf0175eeaba9a2 (diff) | |
| parent | 9d4eb9ad99f7c3abf7abaeaf7ea51f98f9445e75 (diff) | |
| download | bitcoin-f97d335942ae1a78c4898acf8640d99f4deaa6d3.tar.xz | |
Merge #8392: Fix several node initialization issues
9d4eb9a Do diskspace check before import thread is started (Pieter Wuille)
aa59f2e Add extra message to avoid a long 'Loading banlist' (Pieter Wuille)
0fd2a33 Use a signal to continue init after genesis activation (Pieter Wuille)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2a8772a97d..3a07190a62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4313,8 +4313,6 @@ bool InitBlockIndex(const CChainParams& chainparams) CBlockIndex *pindex = AddToBlockIndex(block); if (!ReceivedBlockTransactions(block, state, pindex, blockPos)) return error("LoadBlockIndex(): genesis block not accepted"); - if (!ActivateBestChain(state, chainparams, &block)) - return error("LoadBlockIndex(): genesis block cannot be activated"); // Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data return FlushStateToDisk(state, FLUSH_STATE_ALWAYS); } catch (const std::runtime_error& e) { |