Fix crash on incorrect object destruction event

#1920
2024-03-04 14:26:47 +01:00
parent 2175f46a10
commit 84d3103278
1 changed files with 6 additions and 4 deletions
--- a/Source/Engine/Scripting/Scripting.cpp
+++ b/Source/Engine/Scripting/Scripting.cpp
@@ -852,10 +852,12 @@ void ScriptingObjectReferenceBase::OnSet(ScriptingObject* object)

 void ScriptingObjectReferenceBase::OnDeleted(ScriptingObject* obj)
 {
-    ASSERT(_object == obj);
-    _object->Deleted.Unbind<ScriptingObjectReferenceBase, &ScriptingObjectReferenceBase::OnDeleted>(this);
-    _object = nullptr;
-    Changed();
+    if (_object == obj)
+    {
+        _object->Deleted.Unbind<ScriptingObjectReferenceBase, &ScriptingObjectReferenceBase::OnDeleted>(this);
+        _object = nullptr;
+        Changed();
+    }
 }

 ScriptingObject* Scripting::FindObject(Guid id, MClass* type)