From b450e6f2653dd19e3da187006a0e51d99e07a214 Mon Sep 17 00:00:00 2001 From: Zhi Qi Date: Sun, 16 Oct 2022 07:59:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E7=BB=88=E6=AD=A2=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=9C=89=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E5=87=BA=E7=8E=B0=E7=9A=84=E2=80=9C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=87=BA=E9=94=99=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Assistant.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 5e7ddce29e..e4765acc86 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -263,7 +263,9 @@ void Assistant::working_proc() } lock.unlock(); - task_callback(ret ? AsstMsg::TaskChainCompleted : AsstMsg::TaskChainError, callback_json, this); + // We don't consider a task failed when user stop it. + auto msg = ret || m_thread_idle ? AsstMsg::TaskChainSuccess : AsstMsg::TaskChainFailed; + task_callback(msg, callback_json, this); if (!m_thread_idle && m_tasks_list.empty()) { callback_json["finished_tasks"] = json::array(finished_tasks); From 77820b134caf595f1751d3bd6ecffc02d9b1fd73 Mon Sep 17 00:00:00 2001 From: Zhi Qi Date: Sun, 16 Oct 2022 08:24:50 +0800 Subject: [PATCH 2/2] fix compile error --- src/MeoAssistant/Assistant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index e4765acc86..400be5fca5 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -264,7 +264,7 @@ void Assistant::working_proc() lock.unlock(); // We don't consider a task failed when user stop it. - auto msg = ret || m_thread_idle ? AsstMsg::TaskChainSuccess : AsstMsg::TaskChainFailed; + auto msg = ret || m_thread_idle ? AsstMsg::TaskChainCompleted : AsstMsg::TaskChainError; task_callback(msg, callback_json, this); if (!m_thread_idle && m_tasks_list.empty()) {