added fix to terminate the control module with the pipeline

Apra-Labs · Sep 17, 2024 · e451b05 · e451b05
1 parent 39c24b6
commit e451b05
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/base/src/PipeLine.cpp b/base/src/PipeLine.cpp
@@ -247,6 +247,12 @@ void PipeLine::wait_for_all(bool ignoreStatus)
  Module& m = *(i->get());
  m.myThread.join();
  }
+
+ if ((modules[0]->controlModule) != nullptr)
+ {
+ Module& m = *(modules[0]->controlModule);
+ m.myThread.join();
+ }
 }
 
 
@@ -264,11 +270,24 @@ void PipeLine::interrup_wait_for_all()
  m.myThread.interrupt();
  }
 
+ if ((modules[0]->controlModule) != nullptr)
+ {
+ Module& m = *(modules[0]->controlModule);
+ m.myThread.interrupt();
+ }
+
  for (auto i = modules.begin(); i != modules.end(); i++)
  {
  Module& m = *(i->get());
  m.myThread.join();
  }
+
+ if ((modules[0]->controlModule) != nullptr)
+ {
+ Module& m = *(modules[0]->controlModule);
+ m.myThread.join();
+ }
+
  myStatus = PL_STOPPED;
 }