Merge pull request #2968 from TheBlueMatt/master

Don't warn about forks while fIsInitialDownload

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 24fd1fadbc..b708879f16 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1421,6 +1421,11 @@ CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
 
 void CheckForkWarningConditions()
 {
+    // Before we get past initial download, we cannot reliably alert about forks
+    // (we assume we don't get stuck on a fork before the last checkpoint)
+    if (IsInitialBlockDownload())
+        return;
+
     // If our best fork is no longer within 72 blocks (+/- 12 hours if no one mines it)
     // of our head, drop it
     if (pindexBestForkTip && nBestHeight - pindexBestForkTip->nHeight >= 72)