Merge pull request #2470 from Diapolo/progressbarlabel

Bitcoin-Qt: update for BitcoinGUI::eventFilter()

src/qt/bitcoingui.cpp

@@ -752,7 +752,7 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event)
     if (event->type() == QEvent::StatusTip)
     {
         // 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 QMainWindow::eventFilter(object, event);