From 65f4176fa82461b5ba3bde8e0c5c41dda04428d2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 17 Oct 2013 15:49:53 +0200 Subject: [PATCH] Fix deadlock in WorkQueue::Join(). --- lib/base/workqueue.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 6a6d25b24..aabb9ed27 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -62,6 +62,8 @@ void WorkQueue::Join(void) { boost::mutex::scoped_lock lock(m_Mutex); m_Joined = true; + m_CV.notify_all(); + while (!m_Stopped) m_CV.wait(lock); } -- 2.40.0