Correct exit from process in AsyncDetector

Author: Nuzhny007

.gitignore

@@ -1,3 +1,3 @@
 build
-CMakeLists.txt.user
+CMakeLists.txt.user*
 

async_detector/AsyncDetector.cpp

@@ -51,7 +51,6 @@ void AsyncDetector::Process()
     bool stopFlag = false;
 
     std::thread thCapture(CaptureThread, m_inFile, m_startFrame, &m_fps, &m_framesQue, &stopFlag);
-    thCapture.detach();
 
     cv::namedWindow("Video", cv::WINDOW_NORMAL | cv::WINDOW_KEEPRATIO);
 
@@ -308,9 +307,7 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, float* f
     cv::cvtColor(firstFrame, firstGray, cv::COLOR_BGR2GRAY);
 
     std::thread thDetection(DetectThread, detectorConfig, firstGray, framesQue, stopFlag);
-    thDetection.detach();
     std::thread thTracking(TrackingThread, trackerSettings, framesQue, stopFlag);
-    thTracking.detach();
 
     // Capture frame
     for (; !(*stopFlag);)
@@ -322,6 +319,7 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, float* f
         {
             std::cerr << "Frame is empty!" << std::endl;
             *stopFlag = true;
+            framesQue->SetBreak(true);
             break;
         }
 		if (frameInfo->m_clFrame.empty())
@@ -335,14 +333,14 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, float* f
         std::this_thread::sleep_for(std::chrono::milliseconds(1000 / cvRound(*fps)));
     }
 
-    if (thDetection.joinable())
-    {
-        thDetection.join();
-    }
     if (thTracking.joinable())
     {
         thTracking.join();
     }
+    if (thDetection.joinable())
+    {
+        thDetection.join();
+    }
 }
 
 ///

async_detector/Queue.h

@@ -262,5 +262,11 @@ class FramesQueue : public SafeQueue<frame_ptr>
         //QUE_LOG << "Signal end: " << ts << std::endl;
     }
 
+    void SetBreak(bool val)
+    {
+        m_break = val;
+    }
+
 private:
+    bool m_break = false;
 };

example/VideoExample.cpp

@@ -90,7 +90,6 @@ void VideoExample::Process()
 
     Gate trackLock;
     std::thread thCapDet(CaptureAndDetect, this, &stopCapture, &frameLock, &trackLock);
-    thCapDet.detach();
 
     {
         if (!frameLock.WaitAtGateUntil(m_captureTimeOut))