asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #80072 from RedworkDE/3x-localize-win-path

Browse source 
[3.x] Fix `ProjectSettings::localize_path` for Windows paths
This commit is contained in:
Rémi Verschelde 2023-08-08 14:26:53 +02:00
commit 08832a00bf
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/project_settings.cpp
View file

@ -64,15 +64,15 @@ String ProjectSettings::get_resource_path() const {
};
String ProjectSettings::localize_path(const String &p_path) const {
if (resource_path.empty() || p_path.begins_with("res://") || p_path.begins_with("user://") ||
(p_path.is_abs_path() && !p_path.begins_with(resource_path))) {
return p_path.simplify_path();
String path = p_path.simplify_path();
if (resource_path.empty() || path.begins_with("res://") || path.begins_with("user://") ||
(path.is_abs_path() && !path.begins_with(resource_path))) {
return path.simplify_path();
}
DirAccess *dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
String path = p_path.replace("\\", "/").simplify_path();
if (dir->change_dir(path) == OK) {
String cwd = dir->get_current_dir();
cwd = cwd.replace("\\", "/");
@ -92,7 +92,7 @@ String ProjectSettings::localize_path(const String &p_path) const {
cwd = cwd.plus_file("");
if (!cwd.begins_with(res_path)) {
return p_path;
return path;
};
return cwd.replace_first(res_path, "res://");