fix: fix StopTask not work (#500)

MaaXYZ · Dec 31, 2024 · 62afa12 · 62afa12
1 parent 0bf1c41
commit 62afa12
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/source/MaaFramework/Task/Component/Actuator.cpp b/source/MaaFramework/Task/Component/Actuator.cpp
@@ -61,7 +61,9 @@ bool Actuator::run(const cv::Rect& reco_hit, MaaRecoId reco_id, const PipelineDa
         break;
     case Type::StopTask:
         LogInfo << "Action: StopTask";
-        return false;
+        context_.need_to_stop() = true;
+        ret = true;
+        break;
     default:
         ret = false;
         LogError << "Unknown action" << VAR(static_cast<int>(pipeline_data.action_type));

diff --git a/source/MaaFramework/Task/Context.cpp b/source/MaaFramework/Task/Context.cpp
@@ -203,6 +203,11 @@ std::optional<Context::PipelineData> Context::get_pipeline_data(const std::strin
     return std::nullopt;
 }
 
+bool& Context::need_to_stop()
+{
+    return need_to_stop_;
+}
+
 bool Context::check_pipeline() const
 {
     if (!tasker_) {

diff --git a/source/MaaFramework/Task/Context.h b/source/MaaFramework/Task/Context.h
@@ -50,6 +50,7 @@ class Context
 
 public:
     std::optional<PipelineData> get_pipeline_data(const std::string& task_name);
+    bool& need_to_stop();
 
 private:
     bool check_pipeline() const;
@@ -60,6 +61,8 @@ class Context
     PipelineDataMap pipeline_override_;
 
 private:
+    bool need_to_stop_ = false;
+
     mutable std::vector<std::shared_ptr<Context>> clone_holder_;
 };
 

diff --git a/source/MaaFramework/Task/PipelineTask.cpp b/source/MaaFramework/Task/PipelineTask.cpp
@@ -35,7 +35,7 @@ bool PipelineTask::run()
     PipelineData::NextList interrupt;
     bool error_handling = false;
 
-    while (!next.empty() && !need_to_stop_) {
+    while (!next.empty() && !context_->need_to_stop()) {
         cur_task_ = current.name;
 
         size_t next_size = next.size();
@@ -44,8 +44,8 @@ bool PipelineTask::run()
 
         auto node_detail = run_reco_and_action(list, current);
 
-        if (need_to_stop_) {
-            LogError << "need_to_stop" << VAR(current.name);
+        if (context_->need_to_stop()) {
+            LogWarn << "need_to_stop" << VAR(current.name);
             return true;
         }
 
@@ -105,14 +105,22 @@ bool PipelineTask::run()
 
 void PipelineTask::post_stop()
 {
-    need_to_stop_ = true;
+    if (!context_) {
+        LogError << "context is null";
+        return;
+    }
+    context_->need_to_stop() = true;
 }
 
 NodeDetail PipelineTask::run_reco_and_action(const PipelineData::NextList& list, const PipelineData& pretask)
 {
     if (!tasker_) {
         LogError << "tasker is null";
         return {};
+    }    
+    if (!context_) {
+        LogError << "context is null";
+        return {};
     }
 
     RecoResult reco;
@@ -129,8 +137,8 @@ NodeDetail PipelineTask::run_reco_and_action(const PipelineData::NextList& list,
             break;
         }
 
-        if (need_to_stop_) {
-            LogError << "need_to_stop" << VAR(pretask.name);
+        if (context_->need_to_stop()) {
+            LogWarn << "need_to_stop" << VAR(pretask.name);
             return {};
         }
 

diff --git a/source/MaaFramework/Task/PipelineTask.h b/source/MaaFramework/Task/PipelineTask.h
@@ -19,9 +19,6 @@ class PipelineTask : public TaskBase
 
 private:
     NodeDetail run_reco_and_action(const PipelineData::NextList& list, const PipelineData& pretask);
-
-private:
-    bool need_to_stop_ = false;
 };
 
 MAA_TASK_NS_END