godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

String: plus_file(String) no longer adds a root

Browse Source
This commit is contained in:
Ignacio Etcheverry 2017-01-14 17:47:07 +01:00
parent f392b340ff
commit 95396067b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/ustring.cpp
View File

@ -3822,8 +3822,9 @@ String String::extension() const {
}
String String::plus_file(const String& p_file) const {
if (length()>0 && operator [](length()-1)=='/')
if (empty())
return p_file;
if (operator [](length()-1)=='/' || p_file.operator [](0)=='/')
return *this+p_file;
else
return *this+"/"+p_file;