Reworked stopping of state machine (addition to older fix)

MPIBR · Nov 17, 2017 · 3631ad1 · 3631ad1
1 parent 2855c54
commit 3631ad1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/StateMachineController.cpp b/StateMachineController.cpp
@@ -122,10 +122,11 @@ StateMachineController::~StateMachineController()
 
 void StateMachineController::startStateMachine(audioGameSettings settings)
 {
-    nidaq->DAQmxInitializeInterface();
+    if(stateMachine->isRunning()) //this should not happen
+        stopStateMachine();
+        //stateMachine->stop();
 
-    if(stateMachine->isRunning())
-        stateMachine->stop();
+    nidaq->DAQmxInitializeInterface();
 
     this->settings = settings;
     trialsCurrent = 1; // set index for first trial (1-based)
@@ -147,6 +148,7 @@ void StateMachineController::pauseStateMachine()
 
 void StateMachineController::stopStateMachine()
 {
+    qDebug()<<"StateMachineController:stopStateMachine()";
     timerDialog->removeTimer();
     mainTimer->stop();
     stateMachine->stop();