aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-04-08 11:27:02 -0700
committerWladimir J. van der Laan <[email protected]>2013-04-08 11:27:02 -0700
commitfb17911e9a29399ff46cf3c539a48027924e1afc (patch)
tree80429d9fc4c609d4361317715da34c8ef8ae4ec3 /src
parentMerge pull request #2481 from laanwj/2013_04_cleanup (diff)
parentBitcoin-Qt: update for BitcoinGUI::eventFilter() (diff)
downloaddiscoin-fb17911e9a29399ff46cf3c539a48027924e1afc.tar.xz
discoin-fb17911e9a29399ff46cf3c539a48027924e1afc.zip
Merge pull request #2470 from Diapolo/progressbarlabel
Bitcoin-Qt: update for BitcoinGUI::eventFilter()
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoingui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 795972341..27272e69e 100644
--- a/src/qt/bitcoingui.cpp
+++ b/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);