diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-08-07 08:57:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-08-07 09:04:19 +0200 |
| commit | c1c671feb163c2b3baa2caf97b05a997187e55d5 (patch) | |
| tree | 2e26ad5d6a5709b840fc7529f3e91c57a323dbe8 /src/validation.cpp | |
| parent | Merge #10982: Disconnect network service bits 6 and 8 until Aug 1, 2018 (diff) | |
| parent | Fix some broken init-time prints/constants (diff) | |
| download | discoin-c1c671feb163c2b3baa2caf97b05a997187e55d5.tar.xz discoin-c1c671feb163c2b3baa2caf97b05a997187e55d5.zip | |
Merge #10919: Fix more init bugs.
e7539f8 Fix some broken init-time prints/constants (Matt Corallo)
13ab353 Check for empty coinsview instead of just-reset coinsview in init (Matt Corallo)
fce3f4f Fix resume-of-reindex-after-restart (Matt Corallo)
efac91e Always wait for threadGroup to exit in bitcoind shutdown (Matt Corallo)
Pull request description:
This is a follow-on to #10758 to help move 10758 along. The first fixes a regression in master that was partially fixed in 10758, the second I'm not sure if its a regression or not, but its clearly a bug that should be fixed.
Tree-SHA512: aca7b97a97dca66e1a218a33cc6f4aa002292ff1bb0af64e35b81fbaa91b9504f2605375808b43e93a63fc73634ad079b30ef6c9f4ba338d3b5f72d816dfeaff
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index babf6f152..405ff356f 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3916,7 +3916,6 @@ bool LoadGenesisBlock(const CChainParams& chainparams) if (mapBlockIndex.count(chainparams.GenesisBlock().GetHash())) return true; - // Only add the genesis block if not reindexing (in which case we reuse the one already on disk) try { CBlock &block = const_cast<CBlock&>(chainparams.GenesisBlock()); // Start new block file |