Merge pull request #2470 from Diapolo/progressbarlabel

Bitcoin-Qt: update for BitcoinGUI::eventFilter()
This commit is contained in:
Wladimir J. van der Laan 2013-04-08 11:27:02 -07:00
commit fb17911e9a

View file

@ -752,7 +752,7 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event)
if (event->type() == QEvent::StatusTip) if (event->type() == QEvent::StatusTip)
{ {
// Prevent adding text from setStatusTip(), if we currently use the status bar for displaying other stuff // Prevent adding text from setStatusTip(), if we currently use the status bar for displaying other stuff
if (progressBarLabel->isVisible() && progressBar->isVisible()) if (progressBarLabel->isVisible() || progressBar->isVisible())
return true; return true;
} }
return QMainWindow::eventFilter(object, event); return QMainWindow::eventFilter(object, event);