diff options
| author | fanquake <fanquake@gmail.com> | 2022-11-21 09:55:24 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-11-21 09:58:59 +0000 |
| commit | d14dc8e2c6e80a7bfe0351ee59818a75158c160a (patch) | |
| tree | 7ee8c330f15a3d7e15f226b724f2e25638b5bff5 | |
| parent | 3e0cf5e82ba34f647a906fca8c7f2b849ddee41d (diff) | |
| parent | e54a4deff85d079099c76fb63c128fa597834f75 (diff) | |
Merge bitcoin/bitcoin#26522: [23.x] GUI backports
e54a4deff85d079099c76fb63c128fa597834f75 Fixes bitcoin#26490 by preventing notifications (John Moffett)
Pull request description:
Backports:
- bitcoin-core/gui#680
ACKs for top commit:
jarolrod:
ACK e54a4deff85d079099c76fb63c128fa597834f75
Tree-SHA512: b81c73ece3f3c1e1d1c81bd0bb5b80a47488bca1fa43bbed25bab859cd063cd9b3acc1cff76f07961c3bd01276fab2fad8ea10b9d06e18965a198e78ff1f6705
| -rw-r--r-- | src/qt/bitcoingui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 548f77c74d..9d730a40a5 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -476,7 +476,7 @@ void BitcoinGUI::createMenuBar() connect(minimize_action, &QAction::triggered, [] { QApplication::activeWindow()->showMinimized(); }); - connect(qApp, &QApplication::focusWindowChanged, [minimize_action] (QWindow* window) { + connect(qApp, &QApplication::focusWindowChanged, this, [minimize_action] (QWindow* window) { minimize_action->setEnabled(window != nullptr && (window->flags() & Qt::Dialog) != Qt::Dialog && window->windowState() != Qt::WindowMinimized); }); @@ -491,7 +491,7 @@ void BitcoinGUI::createMenuBar() } }); - connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) { + connect(qApp, &QApplication::focusWindowChanged, this, [zoom_action] (QWindow* window) { zoom_action->setEnabled(window != nullptr); }); #endif |