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/CControlJobDlg.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobDlg.cpp b/SourceCode/Bond/Servo/CControlJobDlg.cpp
index 4cf6bc6..2a57dcd 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobDlg.cpp
@@ -380,7 +380,7 @@
void CControlJobDlg::OnBnClickedButtonCompletionBath()
{
- if (theApp.m_model.getMaster().completeControlJob("娴嬭瘯鎵嬪姩缁撴壒")) {
+ if (theApp.m_model.getMaster().forceCompleteControlJob("娴嬭瘯鎵嬪姩缁撴壒")) {
AfxMessageBox("缁撴壒瀹屾垚");
}
--
Gitblit v1.9.3