Merge #7514: Fix IsInitialBlockDownload for testnet

8aa7226 Fix IsInitialBlockDownload to play nice with testnet (jmacwhyte)
2016-04-28 12:55:30 +02:00
parent 574ddc63d6 8aa722609d
commit d9594bfe0c
1 changed files with 1 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1583,7 +1583,7 @@ bool IsInitialBlockDownload()
    if (lockIBDState)
        return false;
    bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-            pindexBestHeader->GetBlockTime() < GetTime() - nMaxTipAge);
+            std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge);
    if (!state)
        lockIBDState = true;
    return state;