From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/BondEq/CPLC.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPLC.cpp b/SourceCode/Bond/BondEq/CPLC.cpp
index 7a7afcf..3c4d175 100644
--- a/SourceCode/Bond/BondEq/CPLC.cpp
+++ b/SourceCode/Bond/BondEq/CPLC.cpp
@@ -242,7 +242,7 @@
bool CPLC::isConnected()
{
- return m_pChannel->isConnected();
+ return m_pChannel != nullptr && m_pChannel->isConnected();
}
int CPLC::readWord(MC::SOFT_COMPONENT softComponent, unsigned int addr,
@@ -269,6 +269,12 @@
return m_pChannel->writeWord(softComponent, addr, value, funOnWrite);
}
+int CPLC::writeDWord(MC::SOFT_COMPONENT softComponent, unsigned int addr,
+ int value, ONWRITE funOnWrite)
+{
+ return m_pChannel->writeDWord(softComponent, addr, value, funOnWrite);
+}
+
int CPLC::writeData(MC::SOFT_COMPONENT softComponent, unsigned int addr,
const char* pszData, unsigned int length, ONWRITE funOnWrite)
{
--
Gitblit v1.9.3