From 4ec3b6e0317c579c856ceb9f4c7c5146753af5bf Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 08:40:08 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CSlot.cpp | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index ed297f2..958d5c6 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -10,11 +10,16 @@
m_pContext = nullptr;
m_bEnable = FALSE;
m_bLock = FALSE;
+ m_pContext = nullptr;
+ m_pTempContext = nullptr;
}
CSlot::~CSlot()
{
-
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ m_pContext = nullptr;
+ }
}
BOOL CSlot::isEnable()
@@ -92,14 +97,26 @@
return m_pContext == nullptr;
}
+ void CSlot::setContext(CContext* pContext)
+ {
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ }
+
+ m_pContext = pContext;
+ if (m_pContext != nullptr) {
+ m_pContext->addRef();
+ }
+ }
+
CContext* CSlot::getContext()
{
return m_pContext;
}
- void CSlot::setContext(CContext* pContext)
+ CContext* CSlot::getTempContext()
{
- m_pContext = pContext;
+ return m_pTempContext;
}
void CSlot::serialize(CArchive& ar)
@@ -120,7 +137,7 @@
ar >> m_nNo;
ar >> i32; m_materialsType = (MaterialsType)i32;
ReadString(ar, m_strName);
- ar >> i64; m_pContext = (CContext*)i64;
+ ar >> i64; m_pTempContext = (CContext*)i64;
ar >> m_bEnable;
ar >> m_bLock;
}
--
Gitblit v1.9.3