Merge #7514: Fix IsInitialBlockDownload for testnet

8aa7226 Fix IsInitialBlockDownload to play nice with testnet (jmacwhyte)
This commit is contained in:
Wladimir J. van der Laan 2016-04-28 12:55:30 +02:00
commit d9594bfe0c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 1 additions and 1 deletions

View File

@ -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;