diff options
| author | Jonas Schnelli <[email protected]> | 2016-10-21 14:29:54 +0200 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2016-10-21 14:30:02 +0200 |
| commit | 7b1bfa3a8786f0c154d9def003ab1b42f09fe717 (patch) | |
| tree | 4cd7b54b5bc44124382fc8fbc0ac72e6bcc2e073 /src/main.cpp | |
| parent | Merge #8980: RPC: importmulti: Avoid using boost::variant::operator!=, which ... (diff) | |
| parent | [Qt] use NotifyHeaderTip's height and date for the progress update (diff) | |
| download | discoin-7b1bfa3a8786f0c154d9def003ab1b42f09fe717.tar.xz discoin-7b1bfa3a8786f0c154d9def003ab1b42f09fe717.zip | |
Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()
3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 50158b468..8c95f36db 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3006,9 +3006,8 @@ static void NotifyHeaderTip() { CBlockIndex* pindexHeader = NULL; { LOCK(cs_main); - if (!setBlockIndexCandidates.empty()) { - pindexHeader = *setBlockIndexCandidates.rbegin(); - } + pindexHeader = pindexBestHeader; + if (pindexHeader != pindexHeaderOld) { fNotify = true; fInitialBlockDownload = IsInitialBlockDownload(); |