From db6ec06441d2eb9339db6a818fc5558f4b8936e9 Mon Sep 17 00:00:00 2001
From: bmy <2583236812@qq.com>
Date: Sat, 15 Jun 2024 11:04:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BF=87?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E7=AD=89=E5=BE=85=E6=89=80=E6=9C=89?=
 =?UTF-8?q?nexec=E6=89=A7=E8=A1=8C=E5=AE=8C=E6=AF=95=E5=90=8E=E6=89=8D?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=B7=A1=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subtask.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/subtask.py b/subtask.py
index 171d624..ff79a2c 100644
--- a/subtask.py
+++ b/subtask.py
@@ -258,11 +258,18 @@ class task_queuem(task):
             self.status = task_queuem_status.EXECUTING
         # 执行任务函数
         elif self.status is task_queuem_status.EXECUTING:
-            logger.info(f"[TaskM]# Start execute task function")
-            self.task_now.exec()                 # 执行当前任务函数
-            self.queue.task_done()                  # 弹出已执行的任务
-            self.status = task_queuem_status.IDEL   #
-            logger.info(f"[TaskM]# <<<<----------------------")
+            if self.task_now.enable is True:
+                logger.info(f"[TaskM]# Start execute task function")
+                self.task_now.exec()                    # 执行当前任务函数
+                self.queue.task_done()                  # 弹出已执行的任务
+                self.status = task_queuem_status.IDEL   #
+                logger.info(f"[TaskM]# <<<<----------------------")
+            else:
+                logger.info(f"[TaskM]# Start execute task function (nexec)")
+                self.status = task_queuem_status.IDEL   # 空动作不需要阻塞巡线，直接置位
+                self.task_now.exec()                    # 执行当前任务函数
+                self.queue.task_done()                  # 弹出已执行的任务
+                logger.info(f"[TaskM]# <<<<----------------------")
         return True
 
 # 人员施救