summaryrefslogtreecommitdiffstats
path: root/modules/mono/csharp_script.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-11-14 19:31:55 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-11-14 19:31:55 +0100
commitc455cb65550c19afbbf657a1dbf9af2ca3b603da (patch)
tree8b8650eeb68cd10e9a0e93d68edf055ba5966b75 /modules/mono/csharp_script.cpp
parentdcee5cf9fa88b87554c3cd66f5056bd3809f0b50 (diff)
parent39368710770ca08e8bfa4f9d0a6f30a16ad040af (diff)
downloadredot-engine-c455cb65550c19afbbf657a1dbf9af2ca3b603da.tar.gz
Merge pull request #84897 from raulsntos/dotnet/callp-when-invalid
C#: Fail `callp` silently if script is not valid
Diffstat (limited to 'modules/mono/csharp_script.cpp')
-rw-r--r--modules/mono/csharp_script.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 56e4fa53d0..8e1587997b 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -2620,12 +2620,12 @@ MethodInfo CSharpScript::get_method_info(const StringName &p_method) const {
}
Variant CSharpScript::callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
- ERR_FAIL_COND_V(!valid, Variant());
-
- Variant ret;
- bool ok = GDMonoCache::managed_callbacks.ScriptManagerBridge_CallStatic(this, &p_method, p_args, p_argcount, &r_error, &ret);
- if (ok) {
- return ret;
+ if (valid) {
+ Variant ret;
+ bool ok = GDMonoCache::managed_callbacks.ScriptManagerBridge_CallStatic(this, &p_method, p_args, p_argcount, &r_error, &ret);
+ if (ok) {
+ return ret;
+ }
}
return Script::callp(p_method, p_args, p_argcount, r_error);