From 594cf28244b9420e5a8543883f3df183368dfbdd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 13 五月 2025 15:06:12 +0800
Subject: [PATCH] 1. 修复AlarmList.csv文件异常时导致闪退的问题 2. 修复Master.dat异常时进程无法退出的问题

---
 SourceCode/Bond/Servo/CAttributeVector.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CAttributeVector.h b/SourceCode/Bond/Servo/CAttributeVector.h
index c3b9b34..fdbb30a 100644
--- a/SourceCode/Bond/Servo/CAttributeVector.h
+++ b/SourceCode/Bond/Servo/CAttributeVector.h
@@ -11,8 +11,10 @@
 		~CAttributeVector();
 
 	public:
-		void addAttribute(CAttribute* pAttribute);
+		void addAttribute(CAttribute* pAttribute, BOOL bReplace = FALSE);
+		void addAttributeVector(CAttributeVector& av);
 		void clear();
+		void sortWithWeight();
 		unsigned int size();
 		bool empty();
 		CAttribute* getAttribute(unsigned int index);

--
Gitblit v1.9.3