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

Merge pull request #7560 from volzhs/issue-7555

Browse source 
Fix crash when creating new project
This commit is contained in:
Rémi Verschelde 2017-01-16 20:10:34 +01:00 committed by GitHub
commit d13f2f9e25
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/ustring.cpp
View file

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