Merge pull request #5532 from grundman:patch-2

9 years ago · 66f2000548
parent 91e9e6489b f260b13a6f
commit 66f2000548
1 changed files with 4 additions and 0 deletions
--- a/modules/core/src/parallel_pthreads.cpp
+++ b/modules/core/src/parallel_pthreads.cpp
@ -304,14 +304,18 @@ void ForThread::stop()
 {
    if(m_state == eFTStarted)
    {
+        pthread_mutex_lock(&m_thread_mutex);
        m_state = eFTToStop;
+        pthread_mutex_unlock(&m_thread_mutex);

        run();

        pthread_join(m_posix_thread, NULL);
    }

+    pthread_mutex_lock(&m_thread_mutex);
    m_state = eFTStoped;
+    pthread_mutex_unlock(&m_thread_mutex);
 }

 void ForThread::run()