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/AlarmPopupDlg.cpp | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/AlarmPopupDlg.cpp b/SourceCode/Bond/BoounionPLC/AlarmPopupDlg.cpp
index c62e850..d0d5816 100644
--- a/SourceCode/Bond/BoounionPLC/AlarmPopupDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/AlarmPopupDlg.cpp
@@ -65,9 +65,11 @@
// onNext
pAny->addRef();
int code = pAny->getCode();
- if (RX_CODE_BONDER_BEEP == code) {
- bool bMute = FALSE;// theApp.m_model.getBonder().isMute();
- SetButtonBackgroundColors(bMute);
+ if (RX_CODE_BEEP == code) {
+ int nValue = 0;
+ if (pAny->getIntValue("exCode", nValue)) {
+ SetButtonBackgroundColors(nValue == 0);
+ }
}
pAny->release();
}, [&]() -> void {
--
Gitblit v1.9.3