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/TopToolbar.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BondEq/TopToolbar.h b/SourceCode/Bond/BondEq/TopToolbar.h index 1261d35..1228bbb 100644 --- a/SourceCode/Bond/BondEq/TopToolbar.h +++ b/SourceCode/Bond/BondEq/TopToolbar.h @@ -32,6 +32,7 @@ private: CBlButton m_btnRun; CBlButton m_btnStop; + CBlButton m_btnAlarm; CBlButton m_btnSettings; CBlButton m_btnOperator; @@ -52,4 +53,5 @@ afx_msg void OnSize(UINT nType, int cx, int cy); virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); afx_msg void OnButtonOperatorMenuClicked(NMHDR* pNMHDR, LRESULT* pResult); + virtual BOOL PreTranslateMessage(MSG* pMsg); }; -- Gitblit v1.9.3