Skip to content
Closed
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/QtTrayMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int QtTrayMenu::init(struct tray *tray, const bool notification) {
connect(trayIcon, &QSystemTrayIcon::activated, this, &QtTrayMenu::onTrayActivated);
connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &QtTrayMenu::onMessageClicked);
connect(this, &QtTrayMenu::update, this, &QtTrayMenu::onUpdate);
connect(this, &QtTrayMenu::exit, this, &QtTrayMenu::onExitRequested);
connect(this, &QtTrayMenu::exit, this, &QtTrayMenu::onExitRequested, Qt::QueuedConnection);
connect(this, &QtTrayMenu::showMenu, this, &QtTrayMenu::onShowMenu);

updateMenu(tray->menu);
Expand Down Expand Up @@ -149,6 +149,10 @@ void QtTrayMenu::onExitRequested() {
}
// Unset tray structure
trayStruct = nullptr;

// Quit the Qt event loop so that QApplication::exec() returns,
// allowing the main loop to exit and the application to shut down cleanly.
QApplication::quit();
}

void QtTrayMenu::updateMenu(struct tray_menu *items) {
Expand Down
Loading