diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-09 09:26:43 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-09 09:26:43 +0100 |
commit | dabf64bb97618066ec3a08d9e4e706230b9ce078 (patch) | |
tree | c5464dba8eceff0ae1434b838c3eb530f6105a08 | |
parent | 913a65c044ff25392571d6cb34fa79df48ee14ba (diff) | |
parent | e822182bb71033c9899c837c01efa5c978c2cc02 (diff) |
Merge pull request #72913 from KoBeWi/assertion_failed_failed
Fix null message in assert()
-rw-r--r-- | modules/gdscript/gdscript_vm.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_vm.cpp b/modules/gdscript/gdscript_vm.cpp index b99f5d2685..6c26e226a5 100644 --- a/modules/gdscript/gdscript_vm.cpp +++ b/modules/gdscript/gdscript_vm.cpp @@ -3427,7 +3427,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a String message_str; if (_code_ptr[ip + 2] != 0) { GET_VARIANT_PTR(message, 1); - message_str = *message; + Variant message_var = *message; + if (message->get_type() != Variant::NIL) { + message_str = message_var; + } } if (message_str.is_empty()) { err_text = "Assertion failed."; |