diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-09 23:11:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-09 23:11:46 +0100 |
| commit | 69ea7da76642be223f52f671677bcae99ba2db1b (patch) | |
| tree | bb04ae39efd1f00e44c7213a815e8cce6197f403 /modules | |
| parent | 03664e26c5d372b0b4717308efc3144a2a089d4b (diff) | |
| parent | 4299332ecca84a3c9e83fa3c7fe2da988f5c97e3 (diff) | |
Merge pull request #26856 from neikeq/issue-26834
Mono: Fix assemblies path String incorrectly constructed from utf8
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 94aaff30c2..144c260ecf 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -288,7 +288,7 @@ void GDMono::initialize() { mono_install_unhandled_exception_hook(&unhandled_exception_hook, NULL); -#ifdef TOOLS_ENABLED +#ifndef TOOLS_ENABLED if (!DirAccess::exists("res://.mono")) { // 'res://.mono/' is missing so there is nothing to load. We don't need to initialize mono, but // we still do so unless mscorlib is missing (which is the case for projects that don't use C#). diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 85273bfdb4..11c40e9507 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -50,7 +50,7 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin const char *rootdir = mono_assembly_getrootdir(); if (rootdir) { - String framework_dir = String(rootdir).plus_file("mono").plus_file("4.5"); + String framework_dir = String::utf8(rootdir).plus_file("mono").plus_file("4.5"); r_search_dirs.push_back(framework_dir); r_search_dirs.push_back(framework_dir.plus_file("Facades")); } |