aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2013-09-03 22:06:02 -0400
committerMatt Corallo <git@bluematt.me>2013-09-03 22:22:13 -0400
commit55ed3f14751206fc87f0cbf8cb4e223efacef338 (patch)
tree0c1f0fbfca21d46eed328c8db4155bcf49d4c0e3 /src
parentdd30937ce3d6c09bd6e435fab94286e0bea92a11 (diff)
downloadbitcoin-55ed3f14751206fc87f0cbf8cb4e223efacef338.tar.xz
Don't warn about forks while fIsInitialDownload
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp5
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)