Browse Source

Mono: Fix MonoImage filename being set to an invalid path

Ignacio Etcheverry 7 years ago
parent
commit
97fb999976
1 changed files with 5 additions and 4 deletions
  1. 5 4
      modules/mono/mono_gd/gd_mono_assembly.cpp

+ 5 - 4
modules/mono/mono_gd/gd_mono_assembly.cpp

@@ -33,9 +33,10 @@
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/tokentype.h>
 
 
-#include "list.h"
-#include "os/file_access.h"
-#include "os/os.h"
+#include "core/list.h"
+#include "core/os/file_access.h"
+#include "core/os/os.h"
+#include "core/project_settings.h"
 
 
 #include "../godotsharp_dirs.h"
 #include "../godotsharp_dirs.h"
 #include "gd_mono_class.h"
 #include "gd_mono_class.h"
@@ -210,7 +211,7 @@ Error GDMonoAssembly::load(bool p_refonly) {
 	Vector<uint8_t> data = FileAccess::get_file_as_array(path);
 	Vector<uint8_t> data = FileAccess::get_file_as_array(path);
 	ERR_FAIL_COND_V(data.empty(), ERR_FILE_CANT_READ);
 	ERR_FAIL_COND_V(data.empty(), ERR_FILE_CANT_READ);
 
 
-	String image_filename(path);
+	String image_filename = ProjectSettings::get_singleton()->globalize_path(path);
 
 
 	MonoImageOpenStatus status = MONO_IMAGE_OK;
 	MonoImageOpenStatus status = MONO_IMAGE_OK;