Just read the old setting when exiting the settings with cancel button (

#7269) Fixes #7159
OpenModelica · Mar 4, 2021 · cabda56 · cabda56
1 parent 4b507e4
commit cabda56
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/OMEdit/OMEditLIB/Options/OptionsDialog.cpp b/OMEdit/OMEditLIB/Options/OptionsDialog.cpp
@@ -179,9 +179,8 @@ void OptionsDialog::readGeneralSettings()
   }
   // read the working directory
   if (mpSettings->contains("workingDirectory")) {
-    MainWindow::instance()->getOMCProxy()->changeDirectory(mpSettings->value("workingDirectory").toString());
+    mpGeneralSettingsPage->setWorkingDirectory(mpSettings->value("workingDirectory").toString());
   }
-  mpGeneralSettingsPage->setWorkingDirectory(MainWindow::instance()->getOMCProxy()->changeDirectory());
   // read toolbar icon size
   if (mpSettings->contains("toolbarIconSize")) {
     mpGeneralSettingsPage->getToolbarIconSizeSpinBox()->setValue(mpSettings->value("toolbarIconSize").toInt());
@@ -960,21 +959,14 @@ void OptionsDialog::readOMSimulatorSettings()
 {
   // read command line options
   if (mpSettings->contains("OMSimulator/commandLineOptions")) {
-    QString commandLineOptions = mpSettings->value("OMSimulator/commandLineOptions").toString();
-    mpOMSimulatorPage->getCommandLineOptionsTextBox()->setText(commandLineOptions);
-    OMSProxy::instance()->setCommandLineOption(commandLineOptions);
-  }
-  // read working directory
-  if (mpSettings->contains("workingDirectory")) {
-    OMSProxy::instance()->setWorkingDirectory(mpSettings->value("workingDirectory").toString());
+    mpOMSimulatorPage->getCommandLineOptionsTextBox()->setText(mpSettings->value("OMSimulator/commandLineOptions").toString());
   }
   // read logging level
   int index;
   if (mpSettings->contains("OMSimulator/loggingLevel")) {
     index = mpOMSimulatorPage->getLoggingLevelComboBox()->findData(mpSettings->value("OMSimulator/loggingLevel").toInt());
     if (index > -1) {
       mpOMSimulatorPage->getLoggingLevelComboBox()->setCurrentIndex(index);
-      OMSProxy::instance()->setLoggingLevel(mpSettings->value("OMSimulator/loggingLevel").toInt());
     }
   }
 }