diff options
| author | jmacwhyte <[email protected]> | 2016-02-11 18:02:46 -0800 |
|---|---|---|
| committer | jmacwhyte <[email protected]> | 2016-02-11 18:02:46 -0800 |
| commit | 8aa722609d7e736b3a3763e15b552795b94f0e9b (patch) | |
| tree | be77c96a8a4856030104e83498ecd7ace7cf3d4d /src/main.cpp | |
| parent | Merge #7500: Correctly report high-S violations (diff) | |
| download | discoin-8aa722609d7e736b3a3763e15b552795b94f0e9b.tar.xz discoin-8aa722609d7e736b3a3763e15b552795b94f0e9b.zip | |
Fix IsInitialBlockDownload to play nice with testnet
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3ad2979b6..9e478b682 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1384,7 +1384,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; |