diff options
| author | fanquake <fanquake@gmail.com> | 2022-11-18 10:09:47 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-11-18 10:16:01 +0000 |
| commit | c1061be14a515b0ed4f4d646fcd0378c62e6ded3 (patch) | |
| tree | f9f6e17e879754ea02bbc28ba9b0faa02e8b83f3 | |
| parent | dd314fe0c2f64818d2789955a8ceef50d3d6597d (diff) | |
| parent | 39af5f216461b614c78060ff89ea1ab03b936dd0 (diff) | |
| download | bitcoin-c1061be14a515b0ed4f4d646fcd0378c62e6ded3.tar.xz | |
Merge bitcoin/bitcoin#26523: [24.x] GUI backports
39af5f216461b614c78060ff89ea1ab03b936dd0 Fixes bitcoin#26490 by preventing notifications (John Moffett)
Pull request description:
Backports:
- bitcoin-core/gui#680
ACKs for top commit:
jarolrod:
ACK 39af5f216461b614c78060ff89ea1ab03b936dd0
Tree-SHA512: 1c84703395cc750611922aa2c59dc2e2f2e98c92845859f9f57e30ee5371c9a31690318230ab514f2d9b71e75a716a30280aa1e585b6da31e45fd970017bc74e
| -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 894a401e56..18d374311a 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -512,7 +512,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); }); @@ -527,7 +527,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 |