mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-19 18:09:47 +01:00
Code Issues Projects Releases Wiki Activity

Fixes bitcoin#26490 by preventing notifications

Browse Source 
MacOS 13 sends a window focus change notification after the main
window has been destroyed but before the QTApplication has been
destroyed. This results in the menu bar receiving a notification
despite it no longer existing. The solution is to pass the main
window as context when subscribing to the notifications. Qt
automatically unsubscribes to notifications if the sender OR
context is destroyed.
This commit is contained in:
John Moffett 2022-11-15 10:41:03 -05:00
parent 48174c0f28
commit 8a5014cd8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/bitcoingui.cpp
View File

@ -512,7 +512,7 @@ void BitcoinGUI::createMenuBar()
connect(minimize_action, &QAction::triggered, [] { connect(minimize_action, &QAction::triggered, [] {
QApplication::activeWindow()->showMinimized(); 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); 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); zoom_action->setEnabled(window != nullptr);
}); });
#endif #endif