diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2017-10-10 00:25:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 00:25:36 +0200 |
| commit | 18d3ba0c50ac073a4588388a6bdc71cfee44ea1f (patch) | |
| tree | 6be2dcd5518e415daa7804675fe6b1867a6e1e6f /modules/mono/mono_gd/gd_mono.cpp | |
| parent | f240cfe5a9bb447bc7ccabf5b2122a86aefc81c2 (diff) | |
Fix getting struct elements from MonoArray (#11978)
* Fix getting struct elements from MonoArray
* Revert undesired change
Diffstat (limited to 'modules/mono/mono_gd/gd_mono.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 2c88832998..98b57adc50 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -285,7 +285,8 @@ bool GDMono::_load_assembly(const String &p_name, GDMonoAssembly **r_assembly) { MonoAssembly *assembly = mono_assembly_load_full(aname, NULL, &status, false); mono_assembly_name_free(aname); - ERR_FAIL_NULL_V(assembly, false); + if (!assembly) + return false; uint32_t domain_id = mono_domain_get_id(mono_domain_get()); |