From bfcb7b6b0c034ebf534afd73856fd12b15955eb0 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 12 Jan 2023 15:33:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E6=AD=BB?=
 =?UTF-8?q?=E9=94=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Assistant.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp
index 21d1086b86..cc11fa4628 100644
--- a/src/MaaCore/Assistant.cpp
+++ b/src/MaaCore/Assistant.cpp
@@ -49,8 +49,14 @@ Assistant::~Assistant()
 
     m_thread_exit = true;
     m_thread_idle = true;
-    m_condvar.notify_all();
-    m_msg_condvar.notify_all();
+    {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_condvar.notify_all();
+    }
+    {
+        std::unique_lock<std::mutex> lock(m_msg_mutex);
+        m_msg_condvar.notify_all();
+    }
 
     if (m_working_thread.joinable()) {
         m_working_thread.join();