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/CRecipeList.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CRecipeList.h b/SourceCode/Bond/Servo/CRecipeList.h index 7038c70..6b1ac0d 100644 --- a/SourceCode/Bond/Servo/CRecipeList.h +++ b/SourceCode/Bond/Servo/CRecipeList.h @@ -1,4 +1,4 @@ -#pragma once +锘�#pragma once #include <map> @@ -17,12 +17,17 @@ std::map<int, short>& getIds(); std::unordered_map<short, std::vector<uint8_t>>& getParamsRawData(); void reset(); + void reset2(); - // 添加参数包 + // 娣诲姞鍙傛暟鍖� int addParamsPacket(int totalCount, int totalGroup, int currentGroup, short unitId, short recipeId, const char* pszData, size_t size); + // 猸� 鏂板搴忓垪鍖栧拰鍙嶅簭鍒楀寲鍑芥暟 + bool serialize(const std::string& filename) const; + bool deserialize(const std::string& filename); + private: int m_nUnitNo; int m_nToatlGroupCount; -- Gitblit v1.9.3