From f2fd17f68ff175afb9e0740fcbad6b09b94869a3 Mon Sep 17 00:00:00 2001
From: LoudSnorer <Just4Me.1947@gmail.com>
Date: Wed, 10 Jul 2024 13:00:21 -0400
Subject: [PATCH] Fix Crash during change of high resolution checkbox

---
 oscar/main.cpp              |  7 ++++---
 oscar/mainwindow.cpp        |  1 +
 oscar/mainwindow.h          | 16 ++++++++--------
 oscar/preferencesdialog.cpp |  6 +++++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/oscar/main.cpp b/oscar/main.cpp
index fe51453e..f6222056 100644
--- a/oscar/main.cpp
+++ b/oscar/main.cpp
@@ -401,7 +401,7 @@ int main(int argc, char *argv[]) {
     for (int i = 1; i < args.size(); i++) {
         if ((args[i] == "--language") || (args[i] == "--l") ) {
             settings.setValue(LangSetting,"");
-        } else if ( (args[i] == "-l") || (args[i] == "-nop")){
+        } else if ( (args[i] == "-l") || (args[i] == "-nop") || (args[i] == "") ){
             // do nothing. internal calls that current don't have any functions in main.
         } else if (args[i] == "-p") {
             QThread::msleep(1000);
@@ -409,7 +409,8 @@ int main(int argc, char *argv[]) {
             if ((i+1) < args.size())
                 load_profile = args[++i];
             else {
-                optionExit(1,"Missing argument to --profile");
+                // Just view all profiles.
+                load_profile = " ";
             }
         } else if (args[i] == "--datadir") { // mltam's idea
             QString datadir, datadirwas ;
@@ -435,7 +436,7 @@ int main(int argc, char *argv[]) {
         } else if (QString(args[i]).contains("help",Qt::CaseInsensitive)) {
             optionExit(0,QString(""));
         } else {
-            optionExit(3,QString("Invalid Argument. %1").arg(args[i]));
+            optionExit(3,QString("Invalid Argument: '%1'").arg(args[i]));
         }
 
     }   // end of for args loop
diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index c719ed96..052983ca 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1644,6 +1644,7 @@ void MainWindow::reloadProfile()
 
 void MainWindow::RestartApplication(bool force_login, QString cmdline)
 {
+    qDebug() << "Restarting OSCAR";
     CloseProfile();
     p_pref->Save();
 
diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h
index c74f76e5..5520b1dc 100644
--- a/oscar/mainwindow.h
+++ b/oscar/mainwindow.h
@@ -138,14 +138,6 @@ class MainWindow : public QMainWindow
 
     void updateOverview();
 
-    /*! \fn void RestartApplication(bool force_login=false);
-        \brief Closes down OSCAR and restarts it
-        \param bool force_login
-
-        If force_login is set, it will return to the login menu even if it's set to skip
-        */
-    void RestartApplication(bool force_login = false, QString cmdline = QString());
-
     void JumpDaily();
     void JumpOverview();
     void JumpStatistics();
@@ -179,6 +171,14 @@ class MainWindow : public QMainWindow
     //! \brief Recalculate all event summaries and flags
     void doReprocessEvents();
     void doRecompressEvents();
+    /*! \fn void RestartApplication(bool force_login=false);
+        \brief Closes down OSCAR and restarts it
+        \param bool force_login
+
+        If force_login is set, it will return to the login menu even if it's set to skip
+        allow timer to restart application.
+        */
+    void RestartApplication(bool force_login = false, QString cmdline = QString());
 
 
   protected:
diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp
index aae51c85..cdb7bd52 100644
--- a/oscar/preferencesdialog.cpp
+++ b/oscar/preferencesdialog.cpp
@@ -868,7 +868,11 @@ bool PreferencesDialog::Save()
     bool clicicalModeChanged = profile->cpap->clinicalMode() != ui->clinicalMode->isChecked() ;
     p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked());
 
-    needs_restart |= HighResolution::checkBox(true,ui->highResolution);
+    if (HighResolution::checkBox(true,ui->highResolution) ) {
+        //needs_restart = true;
+        QTimer::singleShot(0, mainwin, SLOT(RestartApplication(true, "-p")));
+        return true; // save profile
+    }
     
     if (ui->alternatingColorsCombo->currentIndex() != AppSetting->alternatingColorsCombo()) {
         AppSetting->setAlternatingColorsCombo(ui->alternatingColorsCombo->currentIndex());