summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-09-02 18:30:20 +0200
committerGitHub <noreply@github.com>2019-09-02 18:30:20 +0200
commitaa0ed471222738836767ae48f69fd9f21f7a9ae4 (patch)
treed6ba9c590ed7b47c11e86b66fd7b3f2ee9cd400f /scene/gui
parent97d48e04f92d3c901b6b9b162f603090f9feecff (diff)
parent544c39d1e72759d228bce4c5af72744db698d570 (diff)
Merge pull request #31892 from alexey-makarenko/fix/editor_search_back_infinitely
Fix editor infinite loop in search_prev issue #31328
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/text_edit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 736e546ed8..0464cc1ac8 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -5365,6 +5365,9 @@ bool TextEdit::search(const String &p_key, uint32_t p_search_flags, int p_from_l
break;
}
pos_from = last_pos - p_key.length();
+ if (pos_from < 0) {
+ break;
+ }
}
} else {
while ((last_pos = (p_search_flags & SEARCH_MATCH_CASE) ? text_line.find(p_key, pos_from) : text_line.findn(p_key, pos_from)) != -1) {