diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-02 13:15:53 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-02 13:15:53 +0200 |
| commit | e95b7e84a46fb47a7981b030a07499dba969fb95 (patch) | |
| tree | bae0893558467a10341d5a7cdc02047328792f37 /core/variant/callable_bind.cpp | |
| parent | 7588e3ff0dd7f5e522009f770f99fe593d1ebdb0 (diff) | |
| parent | aff767ef0787db47890a4e33d567b25c4b8ec060 (diff) | |
| download | redot-engine-e95b7e84a46fb47a7981b030a07499dba969fb95.tar.gz | |
Merge pull request #80844 from dalexeev/fix-callable-expected-argc
Fix expected argument count for `Callable` call errors
Diffstat (limited to 'core/variant/callable_bind.cpp')
| -rw-r--r-- | core/variant/callable_bind.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/variant/callable_bind.cpp b/core/variant/callable_bind.cpp index a5629d5d39..9a6380a55f 100644 --- a/core/variant/callable_bind.cpp +++ b/core/variant/callable_bind.cpp @@ -245,9 +245,8 @@ void CallableCustomUnbind::get_bound_arguments(Vector<Variant> &r_arguments, int } void CallableCustomUnbind::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { - if (argcount > p_argcount) { + if (p_argcount < argcount) { r_call_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_call_error.argument = 0; r_call_error.expected = argcount; return; } @@ -255,9 +254,8 @@ void CallableCustomUnbind::call(const Variant **p_arguments, int p_argcount, Var } Error CallableCustomUnbind::rpc(int p_peer_id, const Variant **p_arguments, int p_argcount, Callable::CallError &r_call_error) const { - if (argcount > p_argcount) { + if (p_argcount < argcount) { r_call_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_call_error.argument = 0; r_call_error.expected = argcount; return ERR_UNCONFIGURED; } |