Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-17 13:02:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Exit when receiving OS Close Message when in tray

Browse Source 
* Fixes #2692
* KeePassXC was ignoring OS close messages on shutdown or logoff when minimize to tray on close was enabled. This change causes a second close message (when KeePassXC is hidden to the tray) to actually exit the application.
This commit is contained in:
Jonathan White 2019-05-30 19:46:09 -04:00
parent 6f443ee9fc
commit a747886323
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@ -874,7 +874,9 @@ void MainWindow::closeEvent(QCloseEvent* event)
return; return;
} }
if (config()->get("GUI/MinimizeOnClose").toBool() && !m_appExitCalled) { // Don't ignore close event when the app is hidden to tray.
// This can occur when the OS issues close events on shutdown.
if (config()->get("GUI/MinimizeOnClose").toBool() && !isHidden() && !m_appExitCalled) {
event->ignore(); event->ignore();
hideWindow(); hideWindow();
return; return;