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/BoounionPLC/PagePlcList.cpp | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
index 56b9ff5..fd94ec0 100644
--- a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
+++ b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
@@ -85,6 +85,18 @@
theApp.m_model.notifyPtr(RX_CODE_SELECT_PLC, pSelectedPlc);
}
}
+ else if (RX_PLC_STATE_CHANGED == code) {
+ CPLC* pPlc;
+ if (pAny->getPtrValue("ptr", (void*&)pPlc)) {
+ HTREEITEM hItem = FindItem(pPlc);
+ if (hItem != nullptr && pPlc->isConnected()) {
+ m_treeCtrl.ShowItemBadgeDotMode(hItem);
+ }
+ else {
+ m_treeCtrl.HideItemBadge(hItem);
+ }
+ }
+ }
pAny->release();
}, [&]() -> void {
@@ -191,6 +203,10 @@
for (auto item : plcs) {
HTREEITEM hItem = m_treeCtrl.InsertItem(item.second->getName().c_str(), nullptr, nullptr);
m_treeCtrl.SetItemData(hItem, (DWORD_PTR)item.second);
+ m_treeCtrl.SetItemBadge(hItem, TREE_BADGE_BACKGROUND, TREE_BADGE_FOREGROUND);
+ if (item.second->isConnected()) {
+ m_treeCtrl.ShowItemBadgeDotMode(hItem);
+ }
if (hItemFirst == nullptr) {
hItemFirst = hItem;
}
--
Gitblit v1.9.3