From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index e28bc78..f566568 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -82,14 +82,15 @@
ASSERT(m_pEquipment);
for (int i = 0; i < SLOT_MAX; i++) {
SERVO::CGlass* pGlass = m_pEquipment->getGlassFromSlot(i+1);
- pGlass->addRef();
-
- SERVO::CGlass* pBuddy = pGlass->getBuddy();
- int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
- m_listCtrl.SetItemData(index, (DWORD_PTR)pGlass);
- m_listCtrl.SetItemText(index, 1, pGlass->getID().c_str());
- if (pBuddy != nullptr) {
- m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
+ if (pGlass != nullptr) {
+ pGlass->addRef();
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
+ int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pGlass);
+ m_listCtrl.SetItemText(index, 1, pGlass->getID().c_str());
+ if (pBuddy != nullptr) {
+ m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
+ }
}
}
--
Gitblit v1.9.3