Skip to content

Commit

Permalink
proper fixup!
Browse files Browse the repository at this point in the history
  • Loading branch information
knst committed Nov 7, 2023
1 parent 1972ffb commit a4fc4c9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1234,9 +1234,11 @@ void BitcoinGUI::updateNetworkState()
stopSpinner();
}

/*
if (fNetworkBecameActive || fNetworkBecameInactive) {
setNumBlocks(m_node.getNumBlocks(), QDateTime::fromTime_t(m_node.getLastBlockTime()), QString::fromStdString(m_node.getLastBlockHash()), m_node.getVerificationProgress(), false);
}
*/

nCountPrev = count;
fNetworkActivePrev = fNetworkActive;
Expand Down Expand Up @@ -1476,7 +1478,9 @@ void BitcoinGUI::setAdditionalDataSyncProgress(double nSyncProgress)

// If masternodeSync->Reset() has been called make sure status bar shows the correct information.
if (nSyncProgress == -1) {
/*
setNumBlocks(m_node.getNumBlocks(), QDateTime::fromTime_t(m_node.getLastBlockTime()), QString::fromStdString(m_node.getLastBlockHash()), m_node.getVerificationProgress(), false);
*/
if (clientModel->getNumConnections()) {
labelBlocksIcon->show();
startSpinner();
Expand Down
4 changes: 2 additions & 2 deletions src/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3116,7 +3116,7 @@ static bool NotifyHeaderTip(CChainState& chainstate) LOCKS_EXCLUDED(cs_main) {
// Send block tip changed notifications without cs_main
if (fNotify) {
uiInterface.NotifyHeaderTip(GetSynchronizationState(fInitialBlockDownload), pindexHeader);
GetMainSignals().NotifyHeaderTip(pindexHeader, GetSynchronizationState(fInitialBlockDownload));
GetMainSignals().NotifyHeaderTip(pindexHeader, fInitialBlockDownload);
}
return fNotify;
}
Expand Down Expand Up @@ -3519,7 +3519,7 @@ bool CChainState::MarkConflictingBlock(BlockValidationState& state, CBlockIndex

// Only notify about a new block tip if the active chain was modified.
if (pindex_was_in_chain) {
uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
uiInterface.NotifyBlockTip(GetSynchronizationState(IsInitialBlockDownload()), pindex->pprev);
}
return true;
}
Expand Down

0 comments on commit a4fc4c9

Please sign in to comment.