GH-646 Only reset return value when last return node removed

CraterCrash · Aug 3, 2024 · a0f141c · a0f141c
1 parent 1f92561
commit a0f141c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/script/nodes/functions/function_result.cpp b/src/script/nodes/functions/function_result.cpp
@@ -49,10 +49,14 @@ class OScriptNodeFunctionResultInstance : public OScriptNodeInstance
 
 void OScriptNodeFunctionResult::pre_remove()
 {
-    // When this node is removed, clear the function's return value
+    // When this node is removed, clear the function's return value if this is the last return node
     Ref<OScriptFunction> function = get_function();
     if (function.is_valid())
-        _function->set_has_return_value(false);
+    {
+        Vector<Ref<OScriptNode>> return_nodes = function->get_return_nodes();
+        if (return_nodes.size() == 1)
+            _function->set_has_return_value(false);
+    }
 }
 
 void OScriptNodeFunctionResult::allocate_default_pins()