Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 04:33:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #48927 from KoBeWi/I_fixed_your_left

Browse Source 
Fix usage of String.left()
This commit is contained in:
Rémi Verschelde 2021-05-22 13:09:34 +02:00 committed by GitHub
commit 5d2d24202d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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) {
*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 {

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 != "") {
String cat = path;