From 84d3103278ccd79b4da5839d8b39bd4ce061fafc Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 4 Mar 2024 14:26:47 +0100 Subject: [PATCH] Fix crash on incorrect object destruction event #1920 --- Source/Engine/Scripting/Scripting.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Scripting/Scripting.cpp b/Source/Engine/Scripting/Scripting.cpp index fdde84c5a..31e400906 100644 --- 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(this); - _object = nullptr; - Changed(); + if (_object == obj) + { + _object->Deleted.Unbind(this); + _object = nullptr; + Changed(); + } } ScriptingObject* Scripting::FindObject(Guid id, MClass* type)