Merge pull request #1031 from leapmotion/fix-basic-thread

Lock mutex before notifying condition variable
leapmotion · Oct 31, 2017 · f798aa8 · f798aa8
2 parents ed02b38 + 6f49354
commit f798aa8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/autowiring/BasicThread.cpp b/src/autowiring/BasicThread.cpp
@@ -148,6 +148,9 @@ void BasicThread::OnStop(bool graceful) {
   if (!m_wasStarted) {
     std::lock_guard<std::mutex> lk(m_state->m_lock);
     m_state->m_completed = true;
+  } else {
+    // Make sure that we lock before we notify all
+    std::lock_guard<std::mutex> lk(m_state->m_lock);
   }
 
   // State condition must be notified, in the event that anything is blocking