summaryrefslogtreecommitdiff
path: root/scene/main/window.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-10-09 12:21:31 +0200
committerGitHub <noreply@github.com>2020-10-09 12:21:31 +0200
commitcb9bf98bbac5aa0021a737c6003312a8d3de59b9 (patch)
tree07086a763620e97646c394edf19929b2fa4cba44 /scene/main/window.cpp
parent6dc41b3ad2177c8f168ff6c8e77a28620175dace (diff)
parent4686200f0e70b979436af46cae31c8e3199a95ea (diff)
Merge pull request #42663 from nekomatata/fix-crash-popup-single-window
Fix Popup crash in single window mode
Diffstat (limited to 'scene/main/window.cpp')
-rw-r--r--scene/main/window.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 7c2350d1c0..9f014e8175 100644
--- a/scene/main/window.cpp
+++ b/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;