fix crash on destroy AttachableObject

chakoo2002 · Mar 23, 2024 · 229652f · 229652f
1 parent 70d0579
commit 229652f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/client/attachableobject.cpp b/src/client/attachableobject.cpp
@@ -39,9 +39,9 @@ extern ParticleManager g_particles;
 
 AttachableObject::~AttachableObject()
 {
-    clearAttachedEffects();
+    clearAttachedEffects(false);
     clearAttachedParticlesEffect();
-    clearAttachedWidgets();
+    clearAttachedWidgets(false);
 }
 
 void AttachableObject::attachEffect(const AttachedEffectPtr& obj)
@@ -93,20 +93,21 @@ bool AttachableObject::detachEffectById(uint16_t id)
     return true;
 }
 
-void AttachableObject::onDetachEffect(const AttachedEffectPtr& effect)
+void AttachableObject::onDetachEffect(const AttachedEffectPtr& effect, bool callEvent)
 {
     if (effect->isHidedOwner())
         --m_ownerHidden;
 
     onStartDetachEffect(effect);
 
-    effect->callLuaField("onDetach", attachedObjectToLuaObject());
+    if (callEvent)
+        effect->callLuaField("onDetach", attachedObjectToLuaObject());
 }
 
-void AttachableObject::clearAttachedEffects()
+void AttachableObject::clearAttachedEffects(bool callEvent)
 {
     for (const auto& e : m_attachedEffects)
-        onDetachEffect(e);
+        onDetachEffect(e, callEvent);
     m_attachedEffects.clear();
 }
 
@@ -272,7 +273,7 @@ bool AttachableObject::detachWidget(const UIWidgetPtr& widget)
     return true;
 }
 
-void AttachableObject::clearAttachedWidgets()
+void AttachableObject::clearAttachedWidgets(bool callEvent)
 {
     // keep the same behavior as detachWidget
     auto oldList = std::move(m_attachedWidgets);
@@ -281,7 +282,9 @@ void AttachableObject::clearAttachedWidgets()
     for (const auto& widget : oldList) {
         g_map.removeAttachedWidgetFromObject(widget);
         widget->removeOnDestroyCallback("attached-widget-destroy");
-        widget->callLuaField("onDetached", asLuaObject());
+
+        if (callEvent)
+            widget->callLuaField("onDetached", asLuaObject());
     }
 }
 

diff --git a/src/client/attachableobject.h b/src/client/attachableobject.h
@@ -35,7 +35,7 @@ class AttachableObject : public LuaObject
     virtual bool isThing() { return false; }
 
     void attachEffect(const AttachedEffectPtr& obj);
-    void clearAttachedEffects();
+    void clearAttachedEffects(bool callEvent = true);
     void clearTemporaryAttachedEffects();
     void clearPermanentAttachedEffects();
     bool detachEffectById(uint16_t id);
@@ -59,14 +59,14 @@ class AttachableObject : public LuaObject
     bool hasAttachedWidgets() { return !m_attachedWidgets.empty(); };
     bool isWidgetAttached(const UIWidgetPtr& widget);
     void attachWidget(const UIWidgetPtr& widget);
-    void clearAttachedWidgets();
+    void clearAttachedWidgets(bool callEvent = true);
     bool detachWidgetById(const std::string& id);
     bool detachWidget(const UIWidgetPtr& widget);
     UIWidgetPtr getAttachedWidgetById(const std::string& id);
 
 protected:
     void drawAttachedEffect(const Point& dest, LightView* lightView, bool isOnTop);
-    void onDetachEffect(const AttachedEffectPtr& effect);
+    void onDetachEffect(const AttachedEffectPtr& effect, bool callEvent = true);
     void drawAttachedParticlesEffect(const Point& dest);
 
     std::vector<AttachedEffectPtr> m_attachedEffects;