diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-06 09:41:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 09:41:03 +0100 |
| commit | d834789f475d431b10dcaef8804cd75dcd8b47dd (patch) | |
| tree | 2d6561ce32b45bcb57aec90ccd715bb91f0486b7 /modules/mono/signal_awaiter_utils.cpp | |
| parent | 286ad957490642b3aaa70829efbfdc28904513df (diff) | |
| parent | a946f84e3d115ed313dbe511ba33390fc204fd11 (diff) | |
| download | redot-engine-d834789f475d431b10dcaef8804cd75dcd8b47dd.tar.gz | |
Merge pull request #44106 from neikeq/mono-invoke-no-params-boxing
Don't box params on Native->C# calls with Variant params
Diffstat (limited to 'modules/mono/signal_awaiter_utils.cpp')
| -rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index 28777002f5..f220abfb4c 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -101,11 +101,15 @@ void SignalAwaiterCallable::call(const Variant **p_arguments, int p_argcount, Va "Resumed after await, but class instance is gone."); #endif - MonoArray *signal_args = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), p_argcount); + MonoArray *signal_args = nullptr; - for (int i = 0; i < p_argcount; i++) { - MonoObject *boxed = GDMonoMarshal::variant_to_mono_object(*p_arguments[i]); - mono_array_setref(signal_args, i, boxed); + if (p_argcount > 0) { + signal_args = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), p_argcount); + + for (int i = 0; i < p_argcount; i++) { + MonoObject *boxed = GDMonoMarshal::variant_to_mono_object(*p_arguments[i]); + mono_array_setref(signal_args, i, boxed); + } } MonoObject *awaiter = awaiter_handle.get_target(); |