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/Servo.vcxproj.filters | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 652252b..09bb6e1 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -174,6 +174,7 @@
<ClCompile Include="CReport.cpp" />
<ClCompile Include="CVariable.cpp" />
<ClCompile Include="CPageVarialbles.cpp" />
+ <ClCompile Include="CPageDataVarialbles.cpp" />
<ClCompile Include="CPageReport.cpp" />
<ClCompile Include="CPageCollectionEvent.cpp" />
<ClCompile Include="ProcessJob.cpp" />
@@ -239,6 +240,11 @@
<ClCompile Include="ConfigurationProduction.cpp" />
<ClCompile Include="CPanelProduction.cpp" />
<ClCompile Include="ProductionStats.cpp" />
+ <ClCompile Include="AccordionWnd.cpp" />
+ <ClCompile Include="CPageProdOverview.cpp" />
+ <ClCompile Include="HmLabel.cpp" />
+ <ClCompile Include="CPageCtrlState.cpp" />
+ <ClCompile Include="AlarmPopupDlg.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -419,6 +425,7 @@
<ClInclude Include="CReport.h" />
<ClInclude Include="CVariable.h" />
<ClInclude Include="CPageVarialbles.h" />
+ <ClInclude Include="CPageDataVarialbles.h" />
<ClInclude Include="CPageReport.h" />
<ClInclude Include="CPageCollectionEvent.h" />
<ClInclude Include="ProcessJob.h" />
@@ -520,6 +527,11 @@
<ClInclude Include="CEventEditDlg.h" />
<ClInclude Include="CReportEditDlg.h" />
<ClInclude Include="CPanelProduction.h" />
+ <ClInclude Include="AccordionWnd.h" />
+ <ClInclude Include="CPageProdOverview.h" />
+ <ClInclude Include="HmLabel.h" />
+ <ClInclude Include="CPageCtrlState.h" />
+ <ClInclude Include="AlarmPopupDlg.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
--
Gitblit v1.9.3