Skip to content
Permalink
Browse files

Merge pull request #26856 from neikeq/issue-26834

Mono: Fix assemblies path String incorrectly constructed from utf8
  • Loading branch information...
akien-mga committed Mar 9, 2019
2 parents 03664e2 + 4299332 commit 69ea7da76642be223f52f671677bcae99ba2db1b
Showing with 2 additions and 2 deletions.
  1. +1 −1 modules/mono/mono_gd/gd_mono.cpp
  2. +1 −1 modules/mono/mono_gd/gd_mono_assembly.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#).
@@ -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"));
}

0 comments on commit 69ea7da

Please sign in to comment.
You can’t perform that action at this time.