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/Servo/CPageLinkSignal.h | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/CPageLinkSignal.h b/SourceCode/Bond/Servo/CPageLinkSignal.h index c671159..e97a68d 100644 --- a/SourceCode/Bond/Servo/CPageLinkSignal.h +++ b/SourceCode/Bond/Servo/CPageLinkSignal.h @@ -14,13 +14,17 @@ virtual ~CPageLinkSignal(); void setEquipment(SERVO::CEquipment* pEquipment); void CreateSignalButtons(); - void UpdateAllSignalStatesFromDevice(); - void UpdateSignalState(int nRow, int nCol, bool bNewState); + void UpdateAllUpstreamSignalStatesFromDevice(); + void UpdateAllDownstreamSignalStatesFromDevice(); + void UpdateUpstreamSignalState(int nRow, int nCol, bool bNewState); + void UpdateDownstreamSignalState(int nRow, int nCol, bool bNewState); private: SERVO::CEquipment* m_pEquipment; - CBlButton* m_pBtn[8][8]; + CBlButton* m_pBtnUpstream[8][8]; + CBlButton* m_pBtnDwonstream[8][4]; + BOOL m_bEnable; // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -37,4 +41,5 @@ afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnTimer(UINT_PTR nIDEvent); + afx_msg void OnClickedCheckEnable(); }; -- Gitblit v1.9.3