From 5d4a051f552d8291a3c0d2d6fe8b41e9455a3dab Mon Sep 17 00:00:00 2001
From: Mark Watkins <mark@jedimark.net>
Date: Sat, 5 May 2018 19:13:39 +1000
Subject: [PATCH] Fix yet another mac shutdown bug and some override rubbish

---
 sleepyhead/Graphs/gGraphView.h | 24 ++++++++++++------------
 sleepyhead/mainwindow.cpp      | 23 ++++++++++++++---------
 sleepyhead/mainwindow.h        |  4 ++--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h
index 2f74b9c5..befc6c82 100644
--- a/sleepyhead/Graphs/gGraphView.h
+++ b/sleepyhead/Graphs/gGraphView.h
@@ -321,7 +321,7 @@ class gGraphView
         */
     explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0);
     virtual ~gGraphView();
-    virtual void closeEvent(QCloseEvent * event);
+    void closeEvent(QCloseEvent * event) override;
 
     //! \brief Add gGraph g to this gGraphView, in the requested graph-linkage group
     void addGraph(gGraph *g, short group = 0);
@@ -549,13 +549,13 @@ class gGraphView
     bool pinchTriggered(QPinchGesture * gesture);
 
 
-    virtual void leaveEvent (QEvent * event);
+    void leaveEvent (QEvent * event) override;
 
     //! \brief The heart of the drawing code
 #ifdef BROKEN_OPENGL_BUILD
-    virtual void paintEvent(QPaintEvent *);
+    void paintEvent(QPaintEvent *) override;
 #else
-    virtual void paintGL();
+    void paintGL() override;
 #endif
     //! \brief Calculates the sum of all graph heights
     float totalHeight();
@@ -564,7 +564,7 @@ class gGraphView
     float scaleHeight();
 
     //! \brief Update the OpenGL area when the screen is resized
-    virtual void resizeEvent(QResizeEvent *);
+    void resizeEvent(QResizeEvent *) override;
 
     //! \brief Set the Vertical offset (used in scrolling)
     void setOffsetY(int offsetY);
@@ -573,19 +573,19 @@ class gGraphView
     void setOffsetX(int offsetX);
 
     //! \brief Mouse Moved somewhere in main gGraphArea, propagates to the individual graphs
-    virtual void mouseMoveEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event) override;
     //! \brief Mouse Button Press Event somewhere in main gGraphArea, propagates to the individual graphs
-    virtual void mousePressEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event) override;
     //! \brief Mouse Button Release Event somewhere in main gGraphArea, propagates to the individual graphs
-    virtual void mouseReleaseEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event) override;
     //! \brief Mouse Button Double Click Event somewhere in main gGraphArea, propagates to the individual graphs
-    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
     //! \brief Mouse Wheel Event somewhere in main gGraphArea, propagates to the individual graphs
-    virtual void wheelEvent(QWheelEvent *event);
+    void wheelEvent(QWheelEvent *event) override;
     //! \brief Keyboard event while main gGraphArea has focus.
-    virtual void keyPressEvent(QKeyEvent *event);
+    void keyPressEvent(QKeyEvent *event) override;
     //! \brief Keyboard event while main gGraphArea has focus.
-    virtual void keyReleaseEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event) override;
 
     //! \brief Add Graph to drawing queue, mainly for the benefit of multithreaded drawing code
     void queGraph(gGraph *, int originX, int originY, int width, int height);
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 78724d3d..5706414b 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -249,12 +249,23 @@ void MainWindow::logMessage(QString msg)
 
 void MainWindow::closeEvent(QCloseEvent * event)
 {
-    if (AppSetting->removeCardReminder()) {
-        Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
+    static bool runonce = false;
+    if (!runonce) {
+        if (AppSetting->removeCardReminder()) {
+            Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
+            QThread::msleep(1000);
+            QApplication::processEvents();
+        }
+        runonce = true;
+    } else {
+        qDebug() << "Qt is still calling closevent multiple times";
         QApplication::processEvents();
-        QThread::msleep(1000);
     }
+}
 
+extern MainWindow *mainwin;
+MainWindow::~MainWindow()
+{
     schema::channel.Save();
     if (p_profile) {
         CloseProfile();
@@ -267,12 +278,6 @@ void MainWindow::closeEvent(QCloseEvent * event)
     QSettings settings(getDeveloperName(), getAppName());
     settings.setValue("MainWindow/geometry", saveGeometry());
 
-    QMainWindow::closeEvent(event);
-}
-
-extern MainWindow *mainwin;
-MainWindow::~MainWindow()
-{
     // Trash anything allocated by the Graph objects
     DestroyGraphGlobals();
 
diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h
index 36973d68..34b1c218 100644
--- a/sleepyhead/mainwindow.h
+++ b/sleepyhead/mainwindow.h
@@ -156,8 +156,8 @@ class MainWindow : public QMainWindow
 
 
   protected:
-    virtual void closeEvent(QCloseEvent *);
-    virtual void keyPressEvent(QKeyEvent *event);
+    void closeEvent(QCloseEvent *) override;
+    void keyPressEvent(QKeyEvent *event) override;
 
   private slots:
     /*! \fn void on_action_Import_Data_triggered();