diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-23 13:58:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 13:58:22 +0100 |
| commit | 59e83af201af5a93c7a13750d781c050c2275c07 (patch) | |
| tree | 0e6031fd6e353fb43ff077440fec081bd5278bd4 /modules | |
| parent | 19548753f1cce086857f67284e1e47cf9c8018c1 (diff) | |
| parent | e30aa1386c27b8cc4cb6eb0df8d11792a964bf12 (diff) | |
Merge pull request #15999 from paulloz/fix-csharp-await
Fix csharp await
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_utils.h | 2 | ||||
| -rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/mono_gd/gd_mono_utils.h b/modules/mono/mono_gd/gd_mono_utils.h index 2666433170..259da46c31 100644 --- a/modules/mono/mono_gd/gd_mono_utils.h +++ b/modules/mono/mono_gd/gd_mono_utils.h @@ -43,7 +43,7 @@ namespace GDMonoUtils { typedef MonoObject *(*MarshalUtils_DictToArrays)(MonoObject *, MonoArray **, MonoArray **, MonoObject **); typedef MonoObject *(*MarshalUtils_ArraysToDict)(MonoArray *, MonoArray *, MonoObject **); -typedef MonoObject *(*SignalAwaiter_SignalCallback)(MonoObject *, MonoArray **, MonoObject **); +typedef MonoObject *(*SignalAwaiter_SignalCallback)(MonoObject *, MonoArray *, MonoObject **); typedef MonoObject *(*SignalAwaiter_FailureCallback)(MonoObject *, MonoObject **); typedef MonoObject *(*GodotTaskScheduler_Activate)(MonoObject *, MonoObject **); typedef MonoArray *(*StackTrace_GetFrames)(MonoObject *, MonoObject **); diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index 2671e9a970..b9d8520ac9 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -102,7 +102,7 @@ Variant SignalAwaiterHandle::_signal_callback(const Variant **p_args, int p_argc GDMonoUtils::SignalAwaiter_SignalCallback thunk = CACHED_METHOD_THUNK(SignalAwaiter, SignalCallback); MonoObject *ex = NULL; - thunk(get_target(), &signal_args, &ex); + thunk(get_target(), signal_args, &ex); if (ex) { mono_print_unhandled_exception(ex); |