From 48cdcee8a87c4b0986910233cfcca23535eddada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Fri, 1 Dec 2023 23:14:51 +0100 Subject: [PATCH] Fixed null pointer exception in ShowScriptEditor when script component has no instance --- GlitchyEngine/src/Scripting/ScriptEngine.bf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/GlitchyEngine/src/Scripting/ScriptEngine.bf b/GlitchyEngine/src/Scripting/ScriptEngine.bf index d982cc9..9626054 100644 --- a/GlitchyEngine/src/Scripting/ScriptEngine.bf +++ b/GlitchyEngine/src/Scripting/ScriptEngine.bf @@ -809,8 +809,9 @@ static class ScriptEngine public static void ShowScriptEditor(Entity entity, ScriptComponent* scriptComponent) { - let method = s_EntityEditor.GetMethod("ShowDefaultEntityEditor", 2); - + if (scriptComponent.Instance == null) + return; + ScriptClass scriptClass = ScriptEngine.GetScriptClass(scriptComponent.ScriptClassName); if (scriptClass == null) @@ -823,6 +824,8 @@ static class ScriptEngine #unwarn void*[2] args = .(&entityId, monoReflectionType); + + let method = s_EntityEditor.GetMethod("ShowDefaultEntityEditor", 2); s_EntityEditor.Invoke(method, null, &args); }