Skip to content

fix(linux): break QtMainLoop on exit if loop() was called blocking #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
May 30, 2026
Merged

fix(linux): break QtMainLoop on exit if loop() was called blocking #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/QtTrayMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void QtTrayMenu::onUpdate(struct tray *tray, const bool notify) {
}
}

int QtTrayMenu::loop(int blocking) const {
int QtTrayMenu::loop(int blocking) {
if (!running) {
return -1;
}
Expand All @@ -121,9 +121,11 @@ int QtTrayMenu::loop(int blocking) const {
return -1;
}
if (blocking) {
blockingEventLoop = true;
QApplication::exec();
return -1;
} else {
blockingEventLoop = false;
QApplication::processEvents();
return 0;
}
Expand All @@ -149,6 +151,11 @@ void QtTrayMenu::onExitRequested() {
}
// Unset tray structure
trayStruct = nullptr;

// If we run in a blocking event loop break said loop by quitting the QApplication
if (blockingEventLoop) {
QApplication::quit();
}
}

void QtTrayMenu::updateMenu(struct tray_menu *items) {
Expand Down
3 changes: 2 additions & 1 deletion src/QtTrayMenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class QtTrayMenu: public QObject {
* @param blocking if true the function call will block until QtTrayMenu exits
* @return 0 on successful processing if non-blocking, -1 otherwise
*/
int loop(int blocking) const;
int loop(int blocking);

/**
* @brief Configure metadata for QApplication
Expand Down Expand Up @@ -135,6 +135,7 @@ class QtTrayMenu: public QObject {
QMenu *trayTopMenu = nullptr;
struct tray *trayStruct = nullptr;
bool running = false;
bool blockingEventLoop = false;
struct tray_menu *getTrayMenuItem(QAction *action);
std::function<void()> notificationCallback = nullptr;

Expand Down
Loading