diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-08 11:27:02 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-08 11:27:02 -0700 |
| commit | fb17911e9a29399ff46cf3c539a48027924e1afc (patch) | |
| tree | 80429d9fc4c609d4361317715da34c8ef8ae4ec3 /src/qt | |
| parent | cf03a5ce8a8ab95944c7bd6fbddab3d7465ee374 (diff) | |
| parent | 35ed704d4470c26f30fadc76d068791d01260ee5 (diff) | |
| download | bitcoin-fb17911e9a29399ff46cf3c539a48027924e1afc.tar.xz | |
Merge pull request #2470 from Diapolo/progressbarlabel
Bitcoin-Qt: update for BitcoinGUI::eventFilter()
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 7959723416..27272e69e1 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); |