fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复一个极端情况下的死锁问题

Browse Source
This commit is contained in:
MistEO
2023-01-12 15:33:53 +08:00
parent 8a6a1e7b41
commit bfcb7b6b0c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MaaCore/Assistant.cpp
View File

@@ -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();