diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-15 17:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 17:52:41 +0100 |
| commit | 1aa998cd8527c3f835c58870f9b68871f94763ba (patch) | |
| tree | 699b8ef32c076c4821035cbbc10e27875aaea7bd /modules/mono | |
| parent | 2bc47d1680f8cfd98587e66c44d18bd412fcc10f (diff) | |
| parent | 9b8d1383cef6b9b9419e128000d4c182da1ae621 (diff) | |
Merge pull request #35150 from akien-mga/愚かな猿
Mono: Fix parsing assembly names as UTF-8
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 9d7ac5c5ea..6cf5377e2c 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -129,7 +129,7 @@ MonoAssembly *GDMonoAssembly::_search_hook(MonoAssemblyName *aname, void *user_d (void)user_data; // UNUSED - String name = mono_assembly_name_get_name(aname); + String name = String::utf8(mono_assembly_name_get_name(aname)); bool has_extension = name.ends_with(".dll") || name.ends_with(".exe"); if (no_search) @@ -176,7 +176,7 @@ MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **, vo no_search = true; in_preload = true; - String name = mono_assembly_name_get_name(aname); + String name = String::utf8(mono_assembly_name_get_name(aname)); bool has_extension = name.ends_with(".dll"); GDMonoAssembly *res = NULL; @@ -276,7 +276,7 @@ GDMonoAssembly *GDMonoAssembly::_load_assembly_from(const String &p_name, const } void GDMonoAssembly::_wrap_mono_assembly(MonoAssembly *assembly) { - String name = mono_assembly_name_get_name(mono_assembly_get_name(assembly)); + String name = String::utf8(mono_assembly_name_get_name(mono_assembly_get_name(assembly))); MonoImage *image = mono_assembly_get_image(assembly); |