sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()

Browse Source 
3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
This commit is contained in:
Jonas Schnelli 2016-10-21 14:29:54 +02:00
commit 7b1bfa3a87
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.cpp
View File

@ -3006,9 +3006,8 @@ static void NotifyHeaderTip() {
CBlockIndex* pindexHeader = NULL; CBlockIndex* pindexHeader = NULL;
{ {
LOCK(cs_main); LOCK(cs_main);
if (!setBlockIndexCandidates.empty()) { pindexHeader = pindexBestHeader;
pindexHeader = *setBlockIndexCandidates.rbegin();
}
if (pindexHeader != pindexHeaderOld) { if (pindexHeader != pindexHeaderOld) {
fNotify = true; fNotify = true;
fInitialBlockDownload = IsInitialBlockDownload(); fInitialBlockDownload = IsInitialBlockDownload();

9
src/qt/bitcoingui.cpp
View File

@ -717,13 +717,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
{ {
if (modalOverlay) if (modalOverlay)
{ {
if (header) { if (header)
/* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */ modalOverlay->setKnownBestHeight(count, blockDate);
modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime())); else
}
else {
modalOverlay->tipUpdate(count, blockDate, nVerificationProgress); modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
}
} }
if (!clientModel) if (!clientModel)
return; return;

4
src/qt/forms/modaloverlay.ui
View File

@ -219,7 +219,7 @@ QLabel { color: rgb(40,40,40); }</string>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="numberOfBlocksLeft"> <widget class="QLabel" name="numberOfBlocksLeft">
<property name="text"> <property name="text">
<string>unknown...</string> <string>Unknown...</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -245,7 +245,7 @@ QLabel { color: rgb(40,40,40); }</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>unknown...</string> <string>Unknown...</string>
</property> </property>
</widget> </widget>
</item> </item>

3
src/qt/modaloverlay.cpp
View File

@ -132,7 +132,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
if (estimateNumHeadersLeft < 24 && hasBestHeader) { if (estimateNumHeadersLeft < 24 && hasBestHeader) {
ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count)); ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
} else { } else {
ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers...")); ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight));
ui->expectedTimeLeft->setText(tr("Unknown..."));
} }
} }