Przeglądaj źródła

Merge pull request #12522 from neikeq/where.exe-is-a-liar

Fix 'which' returning file without extension on Windows
Rémi Verschelde 7 lat temu
rodzic
commit
d55e2d0893
1 zmienionych plików z 3 dodań i 3 usunięć
  1. 3 3
      modules/mono/utils/path_utils.cpp

+ 3 - 3
modules/mono/utils/path_utils.cpp

@@ -56,9 +56,6 @@ String path_which(const String &p_name) {
 	for (int i = 0; i < env_path.size(); i++) {
 	for (int i = 0; i < env_path.size(); i++) {
 		String p = path_join(env_path[i], p_name);
 		String p = path_join(env_path[i], p_name);
 
 
-		if (FileAccess::exists(p))
-			return p;
-
 #ifdef WINDOWS_ENABLED
 #ifdef WINDOWS_ENABLED
 		for (int j = 0; j < exts.size(); j++) {
 		for (int j = 0; j < exts.size(); j++) {
 			String p2 = p + exts[j];
 			String p2 = p + exts[j];
@@ -66,6 +63,9 @@ String path_which(const String &p_name) {
 			if (FileAccess::exists(p2))
 			if (FileAccess::exists(p2))
 				return p2;
 				return p2;
 		}
 		}
+#else
+		if (FileAccess::exists(p))
+			return p;
 #endif
 #endif
 	}
 	}