catch aboutToQuitbug/stop-fw-osx

3 files changed, 5 insertions, 7 deletions

diff --git a/gui/components/MainView.qml b/gui/components/MainView.qml
index 25a388c..946e36f 100644
--- a/gui/components/MainView.qml
+++ b/gui/components/MainView.qml
@@ -77,9 +77,6 @@ Page {
             text: qsTr("Quit")
             icon: "../resources/quit.svg"
             triggered: function() {
-                if (ctx.status == "on") {
-                    backend.switchOff()
-                }
                 Qt.callLater(backend.quit)
             }
         }
diff --git a/gui/components/Systray.qml b/gui/components/Systray.qml
index 51f3148..1026f01 100644
--- a/gui/components/Systray.qml
+++ b/gui/components/Systray.qml
@@ -56,9 +56,6 @@ Labs.SystemTrayIcon {
             //: Part of the systray menu; quits the application
             text: qsTr("Quit")
             onTriggered: {
-                if (ctx.status == "on") {
-                    backend.switchOff()
-                }
                 backend.quit()
             }
         }
diff --git a/gui/main.cpp b/gui/main.cpp
index fe96caa..1cb2d0e 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -48,7 +48,6 @@ QString getAppName(QJsonValue info, QString provider) {
 
 auto handler = [](int sig) -> void {
     printf("\nCatched signal(%d): quitting\n", sig);
-    Quit();
     QApplication::quit();
 };
 
@@ -82,6 +81,11 @@ int main(int argc, char **argv) {
     app.setQuitOnLastWindowClosed(false);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
+    QObject::connect(&app, &QApplication::aboutToQuit, []() {
+            qDebug() << ">>> Quitting, bye!";
+            Quit();
+    });
+
 #ifdef OS_WIN
     signal(SIGINT, handler);
     signal(SIGTERM, handler);