Merge pull request #5532 from grundman:patch-2

66f20005 · Vadim Pisarevsky · 91e9e648 · f260b13a · 66f20005
Commit 66f20005 authored Oct 21, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

parallel_pthreads.cpp modules/core/src/parallel_pthreads.cpp +4 -0

No files found.
--- 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()