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

Merge pull request #7525 from neikeq/pr-plus_file

Browse source 
String: plus_file(String) no longer adds a root
This commit is contained in:
Rémi Verschelde 2017-01-14 19:53:35 +01:00 committed by GitHub
commit 52666b88b3
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

@ -3894,8 +3894,9 @@ String String::get_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;