From 2ece96546ec80bf26013d005967cbfdc06156ee7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 16:32:41 +0800
Subject: [PATCH] 1. 添加配方管理类（数据库） 2. 修改用户管理和系统日志管理类的路径和名称 3. 修复合并代码导致系统日志管理窗口的资源异常的问题
---
SourceCode/Bond/Servo/CDoubleGlass.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CDoubleGlass.cpp b/SourceCode/Bond/Servo/CDoubleGlass.cpp
index 1701145..782685a 100644
--- a/SourceCode/Bond/Servo/CDoubleGlass.cpp
+++ b/SourceCode/Bond/Servo/CDoubleGlass.cpp
@@ -1,5 +1,7 @@
#include "stdafx.h"
+#include "Servo.h"
#include "CDoubleGlass.h"
+#include "CGlassPool.h"
namespace SERVO {
@@ -72,11 +74,11 @@
ULONGLONG ulGlass1;
ar >> ulGlass1;
if (ulGlass1 != 0) {
- m_pGlass1 = new CGlass();
+ m_pGlass1 = theApp.m_model.m_glassPool.allocaGlass();
m_pGlass1->serialize(ar);
}
if (ulGlass1 != 0) {
- m_pGlass2 = new CGlass();
+ m_pGlass2 = theApp.m_model.m_glassPool.allocaGlass();
m_pGlass2->serialize(ar);
}
--
Gitblit v1.9.3