#3279

- Fixed the re-simulation crash. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25536 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 13, 2015 · 0b36bac · 0b36bac
1 parent 1d39a03
commit 0b36bac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -541,6 +541,7 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
   if (!isReSimulate) {
     mIsReSimulate = false;
     mClassName = mpLibraryTreeNode->getNameStructure();
+    mFileName = mpLibraryTreeNode->getFileName();
     setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulation).append(" - ").append(mClassName));
     mpSimulationHeading->setText(QString(Helper::simulation).append(" - ").append(mClassName));
     // if the class has experiment annotation then read it.
@@ -562,6 +563,7 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
   } else {
     mIsReSimulate = true;
     mClassName = simulationOptions.getClassName();
+    mFileName = simulationOptions.getFileName();
     setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::reSimulation).append(" - ").append(mClassName));
     mpSimulationHeading->setText(QString(Helper::reSimulation).append(" - ").append(mClassName));
     // Simulation Interval
@@ -929,7 +931,7 @@ SimulationOptions SimulationDialog::createSimulationOptions()
   simulationOptions.setIsValid(true);
   simulationOptions.setReSimulate(mIsReSimulate);
   simulationOptions.setWorkingDirectory(mpMainWindow->getOMCProxy()->changeDirectory());
-  simulationOptions.setFileName(mpLibraryTreeNode->getFileName());
+  simulationOptions.setFileName(mFileName);
   return simulationOptions;
 }
 

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.h b/OMEdit/OMEditGUI/Simulation/SimulationDialog.h
@@ -185,6 +185,7 @@ class SimulationDialog : public QDialog
   QList<SimulationOutputWidget*> mSimulationOutputWidgetsList;
   LibraryTreeNode *mpLibraryTreeNode;
   QString mClassName;
+  QString mFileName;
   bool mIsReSimulate;
 
   void setUpForm();