Mercurial > hg > bitcoin
changeset 2904:c20caec688e6 draft
Merge commit 'e962c7f' into 0.5.0.x
author | Luke Dashjr <luke-jr+git@utopios.org> |
---|---|
date | Sun, 15 Apr 2012 13:23:43 -0400 |
parents | 88eca897c592 (current diff) d518392572bc (diff) |
children | e885e29d0d06 |
files | scripts/qt/make_windows_icon.py |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -4,6 +4,9 @@ * W.J. van der Laan 2011 * The Bitcoin Developers 2011 */ + +#include "checkpoints.h" + #include "bitcoingui.h" #include "transactiontablemodel.h" #include "addressbookpage.h" @@ -480,7 +483,7 @@ } // Set icon state: spinning if catching up, tick otherwise - if(secs < 90*60 && count >= nTotalBlocks) + if(secs < 90*60 && count >= Checkpoints::GetTotalBlocksEstimate()) { tooltip = tr("Up to date") + QString(".\n") + tooltip; labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));