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/AlarmMonitor.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.h b/SourceCode/Bond/BondEq/AlarmMonitor.h
index fe1108c..c7cf2f1 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.h
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.h
@@ -21,14 +21,18 @@
 	virtual void OnTimer(UINT nTimerid);
 	const char* getAlarmText(int nID);
 	virtual void Serialize(CArchive& ar);
-	void getAlarmingMap(std::map<int, CAlarm*>& alarms);
+	std::map<int, CAlarm*>& getAlarmingMap();
 	BOOL isAlarming();
+	CAlarm* getActiveAlarm();
+	void getAlarmRecords(std::list< CAlarm*>& list);
 
 private:
 	BOOL compareData(const char* pScrData, const char* pTarData, int len);
 	int addAlarmTemplate(int id, int level, const char* pszDescription);
 	BOOL isAlarmOn(int id);
 	BOOL findAlarm(std::vector<int>& ids, int id);
+	void addAlarmToHistoryRecord(CAlarm* pAlarm);
+	BOOL addAlarming(CAlarm* pAlarm);
 
 private:
 	std::map<int, CAlarm*> m_mapAlarmTemplate;	// 这是警告的模板，从文件加载

--
Gitblit v1.9.3