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/CCjPage2.h | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index bbbdb59..e9561cd 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -5,12 +5,6 @@
-struct PJWarp {
- void* pj;
- int port;
- bool checkSlot[8];
-};
-
// CPjPage1 瀵硅瘽妗�
class CCjPage2 : public CCjPageBase
@@ -26,7 +20,7 @@
protected:
void Resize();
- virtual void OnApply();
+ virtual int OnApply();
virtual void OnSetContext(void* pContext);
private:
@@ -35,6 +29,7 @@
private:
CCarrierSlotGrid m_grid;
std::vector<PJWarp> m_pjWarps;
+ int m_nSelRadioId;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -54,4 +49,10 @@
afx_msg void OnBnClickedRadio2();
afx_msg void OnBnClickedRadio3();
afx_msg void OnBnClickedRadio4();
+ afx_msg void OnGridSelChanged(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnGridMatChanged(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnBnClickedButtonPort1ProcessStart();
+ afx_msg void OnBnClickedButtonPort2ProcessStart();
+ afx_msg void OnBnClickedButtonPort3ProcessStart();
+ afx_msg void OnBnClickedButtonPort4ProcessStart();
};
--
Gitblit v1.9.3