diff options
| author | Max K. <[email protected]> | 2015-07-30 20:37:58 +0200 |
|---|---|---|
| committer | Max K. <[email protected]> | 2015-07-30 20:37:58 +0200 |
| commit | 2bb124df3f0c15bd79b54655ea2ee146dd2e8201 (patch) | |
| tree | d7f21bfe9765f7282c4719ef80d9621b0fbc34d7 /src/init.cpp | |
| parent | Merge pull request #1206 from rnicoll/1.10-txdb (diff) | |
| parent | doc: add important information about tx flood to release notes (diff) | |
| download | discoin-2bb124df3f0c15bd79b54655ea2ee146dd2e8201.tar.xz discoin-2bb124df3f0c15bd79b54655ea2ee146dd2e8201.zip | |
Merge pull request #1207 from rnicoll/1.10-bitcoin
Bring client up to date with Bitcoin Core 0.11.0
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index fa8e4317e..a49406ec1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1420,13 +1420,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) #endif StartNode(threadGroup, scheduler); -#if 0 // Disable partition check for now, it triggers too often (issue #6251) + // Monitor the chain, and alert if we get blocks much quicker or slower than expected int64_t nPowTargetSpacing = Params().GetConsensus().nPowTargetSpacing; CScheduler::Function f = boost::bind(&PartitionCheck, &IsInitialBlockDownload, boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing); scheduler.scheduleEvery(f, nPowTargetSpacing); -#endif + #ifdef ENABLE_WALLET // Generate coins in the background if (pwalletMain) |