From 21407e7ee3acce124d761fb562aee9f31033d42a Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 04 六月 2025 12:01:21 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CMaster.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 2783329..33a5fc7 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -647,12 +647,12 @@
lock();
- delete m_pActiveRobotTask;
- m_pActiveRobotTask = nullptr;
if (m_listener.onRobotTaskEvent != nullptr) {
- m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 0);
+ m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, 1);
}
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
}
unlock();
}
--
Gitblit v1.9.3