diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-07-31 20:10:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 20:10:04 +0200 |
| commit | ccce161d0e8b03cb7abc3186e920547d6914ef56 (patch) | |
| tree | 8d061eddc8c874b7fe8879c0f64ecd2ed348b0d7 /modules/mono/mono_gd/gd_mono_method.cpp | |
| parent | 3f01f40e91c962b68fd18c0ca00144dfb6aee65f (diff) | |
| parent | 4172fa03b56bb60fe096639585e0ca40df73b677 (diff) | |
| download | redot-engine-ccce161d0e8b03cb7abc3186e920547d6914ef56.tar.gz | |
Merge pull request #20639 from neikeq/issue-20531-and-cleanup
Mono: Fix property set_value and cleanup
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_method.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_method.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/modules/mono/mono_gd/gd_mono_method.cpp b/modules/mono/mono_gd/gd_mono_method.cpp index c8df1038ce..630bda8b4e 100644 --- a/modules/mono/mono_gd/gd_mono_method.cpp +++ b/modules/mono/mono_gd/gd_mono_method.cpp @@ -105,9 +105,7 @@ MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, } MonoException *exc = NULL; - GD_MONO_BEGIN_RUNTIME_INVOKE; - MonoObject *ret = mono_runtime_invoke_array(mono_method, p_object, params, (MonoObject **)&exc); - GD_MONO_END_RUNTIME_INVOKE; + MonoObject *ret = GDMonoUtils::runtime_invoke_array(mono_method, p_object, params, &exc); if (exc) { ret = NULL; @@ -121,9 +119,7 @@ MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, return ret; } else { MonoException *exc = NULL; - GD_MONO_BEGIN_RUNTIME_INVOKE; - mono_runtime_invoke(mono_method, p_object, NULL, (MonoObject **)&exc); - GD_MONO_END_RUNTIME_INVOKE; + GDMonoUtils::runtime_invoke(mono_method, p_object, NULL, &exc); if (exc) { if (r_exc) { @@ -144,9 +140,7 @@ MonoObject *GDMonoMethod::invoke(MonoObject *p_object, MonoException **r_exc) { MonoObject *GDMonoMethod::invoke_raw(MonoObject *p_object, void **p_params, MonoException **r_exc) { MonoException *exc = NULL; - GD_MONO_BEGIN_RUNTIME_INVOKE; - MonoObject *ret = mono_runtime_invoke(mono_method, p_object, p_params, (MonoObject **)&exc); - GD_MONO_END_RUNTIME_INVOKE; + MonoObject *ret = GDMonoUtils::runtime_invoke(mono_method, p_object, p_params, &exc); if (exc) { ret = NULL; |