From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突,重新提交
---
SourceCode/Bond/Servo/HsmsAction.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsAction.cpp b/SourceCode/Bond/Servo/HsmsAction.cpp
index 0792df5..1c0d71c 100644
--- a/SourceCode/Bond/Servo/HsmsAction.cpp
+++ b/SourceCode/Bond/Servo/HsmsAction.cpp
@@ -104,7 +104,7 @@
BOOL CHsmsAction::incrementAndCheckTimeout()
{
unsigned int nResponseTime = InterlockedIncrement(&m_nResponseTime);
- return nResponseTime >= m_nTimeout;
+ return nResponseTime >= m_nTimeout + 1;
}
int CHsmsAction::serialize(char* pszBuffer, int nBufferSize)
--
Gitblit v1.9.3