From 90ccfee0f77694dab5965dc985da9f0caed649ff Mon Sep 17 00:00:00 2001
From: SunderB <20426079+SunderB@users.noreply.github.com>
Date: Tue, 27 Apr 2021 21:48:34 +0100
Subject: [PATCH] [GUI]: Ensure that the UI settings are saved before
 restarting Sonic Pi

---
 app/gui/qt/mainwindow.cpp             | 7 ++++---
 app/gui/qt/widgets/settingswidget.cpp | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
index 2f0ba855ac..bd7ac6c468 100644
--- a/app/gui/qt/mainwindow.cpp
+++ b/app/gui/qt/mainwindow.cpp
@@ -3243,6 +3243,9 @@ void MainWindow::writeSettings()
     gui_settings->setValue("docsplitState", docsplit->saveState());
     gui_settings->setValue("windowState", saveState());
     gui_settings->setValue("windowGeom", saveGeometry());
+
+    // Force Qt to write the settings to the ini file
+    gui_settings->sync();
 }
 
 void MainWindow::loadFile(const QString& fileName, SonicPiScintilla*& text)
@@ -3339,9 +3342,7 @@ void MainWindow::restartApp() {
     // Save settings and perform some cleanup
     writeSettings();
     onExitCleanup();
-    std::cout << "Performing application restart... please wait..." << std::endl;
-    // Allow cleanup to complete
-    std::this_thread::sleep_for(2s);
+    std::cout << "Performing application restart..." << std::endl;
 
     // Create new process
     QStringList args = qApp->arguments();
diff --git a/app/gui/qt/widgets/settingswidget.cpp b/app/gui/qt/widgets/settingswidget.cpp
index 7844a1cda2..d675b5e746 100644
--- a/app/gui/qt/widgets/settingswidget.cpp
+++ b/app/gui/qt/widgets/settingswidget.cpp
@@ -83,6 +83,8 @@ SettingsWidget::SettingsWidget(int port, bool i18n, SonicPiSettings *piSettings,
  * Destructor
  */
 SettingsWidget::~SettingsWidget() {
+  // Set the settings before exiting
+  updateSettings();
 }
 
 QSize SettingsWidget::sizeHint() const
@@ -549,6 +551,7 @@ void SettingsWidget::updateScopeKindVisibility() {
 void SettingsWidget::updateSelectedUILanguage(QString lang) {
   int index = available_languages.indexOf(lang);
   language_combo->setCurrentIndex(index);
+  updateSettings();
 }
 
 void SettingsWidget::toggleScope( QWidget* qw ) {