aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner2018-04-30 15:04:30 -0400
committerGary Oberbrunner2018-04-30 15:30:21 -0400
commit8d5c30ce83c2ec69403338f9bc2809aef6f1539b (patch)
tree65ade822da09eaab5252a8c69d3b6dcbc99dc1c7
parent613a8bee415381a8564d34092b479e1f159e8e60 (diff)
downloadgodot-8d5c30ce83c2ec69403338f9bc2809aef6f1539b.tar.gz
godot-8d5c30ce83c2ec69403338f9bc2809aef6f1539b.tar.zst
godot-8d5c30ce83c2ec69403338f9bc2809aef6f1539b.zip
-rw-r--r--core/variant.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/variant.cpp b/core/variant.cpp
index 5d48c8785..a6df95e31 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -3167,7 +3167,11 @@ String Variant::get_call_error_text(Object *p_base, const StringName &p_method,
if (ce.error == Variant::CallError::CALL_ERROR_INVALID_ARGUMENT) {
int errorarg = ce.argument;
- err_text = "Cannot convert argument " + itos(errorarg + 1) + " from " + Variant::get_type_name(p_argptrs[errorarg]->get_type()) + " to " + Variant::get_type_name(ce.expected) + ".";
+ if (p_argptrs) {
+ err_text = "Cannot convert argument " + itos(errorarg + 1) + " from " + Variant::get_type_name(p_argptrs[errorarg]->get_type()) + " to " + Variant::get_type_name(ce.expected) + ".";
+ } else {
+ err_text = "Cannot convert argument " + itos(errorarg + 1) + " from [missing argptr, type unknown] to " + Variant::get_type_name(ce.expected) + ".";
+ }
} else if (ce.error == Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS) {
err_text = "Method expected " + itos(ce.argument) + " arguments, but called with " + itos(p_argcount) + ".";
} else if (ce.error == Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS) {