diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-14 19:53:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 19:53:35 +0100 |
| commit | 52666b88b39a91655553ba6ab5bbe47c09861e28 (patch) | |
| tree | 33735f27fc0a1e88bf34d56a6a7d2149000a5754 /core | |
| parent | a49e75e3741e08cca4c8f6fef41ff8088fe3c057 (diff) | |
| parent | 95396067b778c902e2b28efdbe281b4dd4a6effd (diff) | |
Merge pull request #7525 from neikeq/pr-plus_file
String: plus_file(String) no longer adds a root
Diffstat (limited to 'core')
| -rw-r--r-- | core/ustring.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 9fb8cfc00f..66608379be 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -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; |