fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复running不准确的问题

Browse Source
This commit is contained in:
MistEO
2023-06-29 23:17:14 +08:00
parent b05d322b15
commit 8277fba8ee
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MaaCore/Assistant.cpp
View File

@@ -367,7 +367,7 @@ bool Assistant::stop(bool block)
bool asst::Assistant::running() const
{
return !m_thread_idle;
return m_running;
}
void Assistant::working_proc()
@@ -378,17 +378,20 @@ void Assistant::working_proc()
while (true) {
std::unique_lock<std::mutex> lock(m_mutex);
if (m_thread_exit) {
m_running = false;
return;
}
if (m_thread_idle || m_tasks_list.empty()) {
finished_tasks.clear();
m_thread_idle = true;
m_running = false;
Log.flush();
m_condvar.wait(lock);
continue;
}
m_running = true;
const auto [id, task_ptr] = m_tasks_list.front();
lock.unlock();
// only one instance of working_proc running, unlock here to allow set_task_param to the running task