From 826322ff86b6021b16a1d5b280aa780f4767fb12 Mon Sep 17 00:00:00 2001
From: Mark Watkins <mark@jedimark.net>
Date: Thu, 26 Apr 2018 00:30:43 +1000
Subject: [PATCH] Really try and fix shutdown crash

---
 sleepyhead/mainwindow.cpp | 28 +++++++---------------------
 sleepyhead/mainwindow.h   |  1 -
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 42eaf480..eb49ae5c 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -236,9 +236,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
     qsrand(QDateTime::currentDateTime().toTime_t());
 
-    // Setup to run a few last minute things before shutdown.
-    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
-
     QList<int> a;
 
     int panel_width = AppSetting->rightPanelWidth();
@@ -254,24 +251,19 @@ void MainWindow::logMessage(QString msg)
     ui->logText->appendPlainText(msg);
 }
 
-void MainWindow::on_aboutToQuit()
-{
-    if (systraymenu) delete systraymenu;
-}
-
 void MainWindow::closeEvent(QCloseEvent * event)
 {
-    schema::channel.Save();
-    if (p_profile) {
-        CloseProfile();
-    }
-
     if (AppSetting->removeCardReminder()) {
         Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
         QApplication::processEvents();
         QThread::msleep(1000);
     }
 
+    schema::channel.Save();
+    if (p_profile) {
+        CloseProfile();
+    }
+
     // Shutdown and Save the current User profile
     Profiles::Done();
 
@@ -285,13 +277,11 @@ void MainWindow::closeEvent(QCloseEvent * event)
 extern MainWindow *mainwin;
 MainWindow::~MainWindow()
 {
-//    if (systraymenu) { delete systraymenu; }
-
-//    if (systray) { delete systray; }
-
     // Trash anything allocated by the Graph objects
     DestroyGraphGlobals();
 
+    if (systraymenu) delete systraymenu;
+
     disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
     shutdownLogger();
 
@@ -613,10 +603,6 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
         ui->tabWidget->setCurrentIndex(AppSetting->openTabAfterImport());
     }
 
-    // Now what was this for???
-    disconnect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
-    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
-
     return c;
 }
 
diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h
index 89ba0f19..faac2111 100644
--- a/sleepyhead/mainwindow.h
+++ b/sleepyhead/mainwindow.h
@@ -326,7 +326,6 @@ class MainWindow : public QMainWindow
     void on_actionExport_Journal_triggered();
 
     void on_actionShow_Performance_Counters_toggled(bool arg1);
-    void on_aboutToQuit();
 
     void on_actionExport_CSV_triggered();