Browse Source

Merge pull request #42663 from nekomatata/fix-crash-popup-single-window

Fix Popup crash in single window mode
Rémi Verschelde 4 years ago
parent
commit
cb9bf98bba
1 changed files with 2 additions and 2 deletions
  1. 2 2
      scene/main/window.cpp

+ 2 - 2
scene/main/window.cpp

@@ -895,11 +895,11 @@ void Window::_window_input(const Ref<InputEvent> &p_ev) {
 
 	if (exclusive_child != nullptr) {
 		Window *focus_target = exclusive_child;
+		focus_target->grab_focus();
 		while (focus_target->exclusive_child != nullptr) {
-			focus_target->grab_focus();
 			focus_target = focus_target->exclusive_child;
+			focus_target->grab_focus();
 		}
-		focus_target->grab_focus();
 
 		if (!is_embedding_subwindows()) { //not embedding, no need for event
 			return;