#3651 macos: attempt to fix app closing issue

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -1,5 +1,11 @@
 # QOwnNotes Changelog
 
+## 26.6.12
+
+- Fixed quitting QOwnNotes on **macOS** when the menu bar item is enabled, so the
+  application no longer minimizes back to the menu bar during quit or session
+  shutdown and blocks shutting down the Mac (for [#3651](https://github.com/pbek/QOwnNotes/issues/3651))
+
 ## 26.6.11
 
 - Fixed the Qt 5 Ubuntu Launchpad release container by pinning it to Ubuntu

src/mainwindow.cpp

@@ -596,6 +596,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
     connect(qApp, &QApplication::commitDataRequest, this, &MainWindow::on_action_Quit_triggered);
 #else
     // Avoid re-entering the Cocoa quit flow on macOS during session shutdown, see #3546.
+    // Still mark shutdown so closeEvent doesn't minimize to the menu bar item and block logout.
+    connect(qApp, &QApplication::commitDataRequest, this,
+            [] { qApp->setProperty("appIsShuttingDown", true); });
 #endif
 
     // Register the LogWidget::LogType type so showStatusBarMessage there doesn't throw a warning,
@@ -3619,7 +3622,8 @@ void MainWindow::storeSettings() {
 
 void MainWindow::closeEvent(QCloseEvent *event) {
     const bool forceQuit = qApp->property("clearAppDataAndExit").toBool();
-    const bool isJustHide = showSystemTray;
+    const bool isAppShuttingDown = qApp->property("appIsShuttingDown").toBool();
+    const bool isJustHide = showSystemTray && !isAppShuttingDown;
 
 #ifdef Q_OS_MAC
     // #1113, unfortunately the closeEvent is also fired when the application