From 57350faee40bba50878658d87e0c875ed3e92571 Mon Sep 17 00:00:00 2001 From: volzhs Date: Tue, 17 Jan 2017 03:20:33 +0900 Subject: Fix crash when creating new project --- core/ustring.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/ustring.cpp b/core/ustring.cpp index 71934b2955..478c427fb9 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3898,10 +3898,9 @@ 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; + return *this+"/"+p_file; } String String::percent_encode() const { -- cgit v1.2.3