From 5d525a883050b6514695f0d805817d3b3e479a1d Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Mon, 31 May 2021 01:14:11 +0000
Subject: [PATCH] Fix deadlock in async work queue

Former-commit-id: 3265f2908e8d3aa567b3b9e6b141a7881c795053
---
 src/AsyncWorkQueue.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/AsyncWorkQueue.cpp b/src/AsyncWorkQueue.cpp
index dae36cc06..9544d1a00 100644
--- a/src/AsyncWorkQueue.cpp
+++ b/src/AsyncWorkQueue.cpp
@@ -25,7 +25,8 @@ void AsyncWorkQueue::WorkerThreadMain()
     while (!m_fQuitting)
     {
         std::unique_lock<std::mutex> lock(m_mutex);
-        m_cvWakeup.wait(lock);
+        if (m_workqueue.empty())
+            m_cvWakeup.wait(lock);
 
         while (!m_workqueue.empty())
         {