Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 20:23:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #67131 from KoBeWi/simplify_the_simplify

Browse Source 
Fix `simplify_path()` breaking `uid://`
This commit is contained in:
Rémi Verschelde 2022-10-10 10:02:41 +02:00
commit bfffc06eb1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/string/ustring.cpp
View File

@ -3669,13 +3669,16 @@ String String::simplify_path() const {
String drive;
if (s.begins_with("local://")) {
drive = "local://";
s = s.substr(8, s.length());
s = s.substr(8);
} else if (s.begins_with("res://")) {
drive = "res://";
s = s.substr(6, s.length());
s = s.substr(6);
} else if (s.begins_with("user://")) {
drive = "user://";
s = s.substr(7, s.length());
s = s.substr(7);
} else if (s.begins_with("uid://")) {
drive = "uid://";
s = s.substr(6);
} else if (is_network_share_path()) {
drive = s.substr(0, 2);
s = s.substr(2, s.length() - 2);
@ -3689,7 +3692,7 @@ String String::simplify_path() const {
}
if (p != -1 && p < s.find("/")) {
drive = s.substr(0, p + 2);
s = s.substr(p + 2, s.length());
s = s.substr(p + 2);
}
}