瀏覽代碼

Merge pull request #26856 from neikeq/issue-26834

Mono: Fix assemblies path String incorrectly constructed from utf8
Rémi Verschelde 6 年之前
父節點
當前提交
69ea7da766
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      modules/mono/mono_gd/gd_mono.cpp
  2. 1 1
      modules/mono/mono_gd/gd_mono_assembly.cpp

+ 1 - 1
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#).

+ 1 - 1
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"));
 	}