Close the result file when the VariablesTreeItem is removed (#7190)

OpenModelica · Feb 18, 2021 · 1459d3c · 1459d3c
1 parent 699fb91
commit 1459d3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp b/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp
@@ -864,10 +864,8 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath
     }
   }
   /* close the .mat file */
-  if (fileName.endsWith(".mat")) {
-    if (matReader.file) {
-      omc_free_matlab4_reader(&matReader);
-    }
+  if (fileName.endsWith(".mat") && matReader.file) {
+    omc_free_matlab4_reader(&matReader);
   }
   mpVariablesTreeView->collapseAll();
   QModelIndex idx = variablesTreeItemIndex(pTopVariablesTreeItem);
@@ -896,6 +894,7 @@ bool VariablesTreeModel::removeVariableTreeItem(QString variable)
     if (pVariablesTreeItem->isActive()) {
       mpVariablesTreeView->getVariablesWidget()->enableVisualizationControls(false);
       mpVariablesTreeView->getVariablesWidget()->rewindVisualization();
+      mpVariablesTreeView->getVariablesWidget()->closeResultFile();
     }
     beginRemoveRows(variablesTreeItemIndex(pVariablesTreeItem->parent()), 0, pVariablesTreeItem->getChildren().size());
     pVariablesTreeItem->removeChildren();

diff --git a/OMEdit/OMEditLIB/Plotting/VariablesWidget.h b/OMEdit/OMEditLIB/Plotting/VariablesWidget.h
@@ -213,6 +213,7 @@ class VariablesWidget : public QWidget
   void updateInitXmlFile(SimulationOptions simulationOptions);
   void initializeVisualization(SimulationOptions simulationOptions);
   double readVariableValue(QString variable, double time);
+  void closeResultFile();
 private:
   TreeSearchFilters *mpTreeSearchFilters;
   Label *mpSimulationTimeLabel;
@@ -239,7 +240,6 @@ class VariablesWidget : public QWidget
   csv_data *mpCSVData;
   QFile mPlotFileReader;
   void selectInteractivePlotWindow(VariablesTreeItem *pVariablesTreeItem);
-  void closeResultFile();
   void openResultFile();
   void updateVisualization();
 public slots: