Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Properly return value with await on non-coroutine

Browse source 
If the keyword `await` is used without a coroutine, it should still
return the value synchronally.
This commit is contained in:
George Marques 2021-10-14 19:58:10 -03:00
parent d36213bab8
commit 056a54db7b
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gdscript_vm.cpp
View file

@ -2098,8 +2098,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
}
if (result.get_type() != Variant::SIGNAL) {
// Not async, return immediately using the target from OPCODE_AWAIT_RESUME.
GET_VARIANT_PTR(target, 3);
*target = result;
ip += 4; // Skip OPCODE_AWAIT_RESUME and its data.
// The stack pointer should be the same, so we don't need to set a return value.
is_signal = false;
} else {
sig = result;