Browse Source

Merge pull request #37485 from RandomShaper/fix_trimmed_res_3.2

Fix res:// trimmed to s:// on Windows (3.2)
Rémi Verschelde 5 years ago
parent
commit
42a3a87e46
1 changed files with 9 additions and 2 deletions
  1. 9 2
      drivers/windows/dir_access_windows.cpp

+ 9 - 2
drivers/windows/dir_access_windows.cpp

@@ -209,8 +209,15 @@ String DirAccessWindows::get_current_dir() {
 String DirAccessWindows::get_current_dir_without_drive() {
 String DirAccessWindows::get_current_dir_without_drive() {
 
 
 	String dir = get_current_dir();
 	String dir = get_current_dir();
-	int p = current_dir.find(":");
-	return p != -1 ? dir.right(p + 1) : dir;
+
+	if (_get_root_string() == "") {
+		int p = current_dir.find(":");
+		if (p != -1) {
+			dir = dir.right(p + 1);
+		}
+	}
+
+	return dir;
 }
 }
 
 
 bool DirAccessWindows::file_exists(String p_file) {
 bool DirAccessWindows::file_exists(String p_file) {