Fix null reference in AddCommandHandlerCallable when callabe does not…

… return an object (#80)
YarnSpinnerTool · Jan 24, 2025 · 30a8174 · 30a8174
1 parent dc5b955
commit 30a8174
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs b/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs
@@ -534,7 +534,8 @@ async Task GenerateCommandHandler(params Variant[] handlerArgs)
             var castArgs = CastToExpectedTypes(argTypes, commandName, handlerArgs);
 
             var current = handler.Call(castArgs.ToArray());
-            if (current.As<GodotObject>().GetClass() == "GDScriptFunctionState")
+            var currentGodotObject = current.As<GodotObject>();
+            if (currentGodotObject != null && currentGodotObject.GetClass() == "GDScriptFunctionState")
             {
                 // callable is from GDScript with await statements
                 await ((SceneTree) Engine.GetMainLoop()).ToSignal(current.AsGodotObject(), "completed");