Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-13 14:44:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

3
core/ustring.cpp
View File

@ -3898,9 +3898,8 @@ String String::get_extension() const {
String String::plus_file(const String& p_file) const {
if (empty())
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;
else
return *this+"/"+p_file;
}