Merge #7514: Fix IsInitialBlockDownload for testnet

8aa7226 Fix IsInitialBlockDownload to play nice with testnet (jmacwhyte)

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;