godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usage of String.left()

This commit is contained in:
kobewi 2021-05-21 15:17:43 +02:00
parent 8c2beeea90
commit ea9660e1cf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/string/ustring.cpp
View File

@ -939,7 +939,7 @@ const char32_t *String::get_data() const {
} }
void String::erase(int p_pos, int p_chars) { void String::erase(int p_pos, int p_chars) {
*this = left(p_pos) + substr(p_pos + p_chars, length() - ((p_pos + p_chars))); *this = left(MAX(p_pos, 0)) + substr(p_pos + p_chars, length() - ((p_pos + p_chars)));
} }
String String::capitalize() const { String String::capitalize() const {

8
editor/editor_inspector.cpp
View File

@ -1824,7 +1824,13 @@ void EditorInspector::update_tree() {
} }
} }
String path = basename.left(basename.rfind("/")); String path;
{
int idx = basename.rfind("/");
if (idx > -1) {
path = basename.left(idx);
}
}
if (use_filter && filter != "") { if (use_filter && filter != "") {
String cat = path; String cat = path;