Fix find_next_valid_focus() freeze

godotengine · Jun 30, 2022 · 8d62b73 · 8d62b73
1 parent 0800d47
commit 8d62b73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
@@ -2422,7 +2422,7 @@ Control *Control::find_next_valid_focus() const {
 			}
 		}
 
-		if (next_child == from) { // No next control.
+		if (next_child == from || next_child == this) { // No next control.
 			return (get_focus_mode() == FOCUS_ALL) ? next_child : nullptr;
 		}
 		if (next_child) {
@@ -2506,7 +2506,7 @@ Control *Control::find_prev_valid_focus() const {
 			}
 		}
 
-		if (prev_child == from) { // No prev control.
+		if (prev_child == from || prev_child == this) { // No prev control.
 			return (get_focus_mode() == FOCUS_ALL) ? prev_child : nullptr;
 		}