Merge branch 'master' into pendulum.

opencor · Jun 27, 2019 · 7cc683d · 7cc683d
1 parent a40f6ca
commit 7cc683d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,6 @@ project(OpenCOR)
 option(ENABLE_CLANG_TIDY "Enable the use of Clang-Tidy" OFF)
 
 option(ENABLE_SAMPLE_PLUGINS "Enable the sample plugins to be built" OFF)
-option(ENABLE_TEST_PLUGINS "Enable the test plugins to be built" OFF)
 option(ENABLE_TESTS "Enable the tests to be built" OFF)
 
 if(NOT WIN32 AND NOT APPLE)

diff --git a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp
@@ -545,6 +545,7 @@ void SimulationExperimentViewWidget::checkSimulationResults(const QString &pFile
     // Make sure that our previous run, if any, is complete, if we are coming
     // here as a result of having added a new run
 
+    SimulationSupport::Simulation *simulation = simulationWidget->simulation();
     int simulationRunsCount = simulation->runsCount();
 
     if (   (pTask == SimulationExperimentViewSimulationWidget::Task::AddRun)