aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-04-06 12:20:02 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-04-06 12:24:52 +0200
commit35ed704d4470c26f30fadc76d068791d01260ee5 (patch)
treec937bb1359af2e2fd91d93880de4adf66102db12 /src
parentab806a69a23c47e75821aa8a1fcd8d7f9e32999e (diff)
downloadbitcoin-35ed704d4470c26f30fadc76d068791d01260ee5.tar.xz
Bitcoin-Qt: update for BitcoinGUI::eventFilter()
- this allows us to use the progressbar and the label independently (if needed) and still prevents setStatusTip() to use them, if one of the 2 is active
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 9da5b85006..d3fcc936c1 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -751,7 +751,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);