maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Popup crash in single window mode

Browse source 
focus_target->exclusive_child could be invalidated during the call to
focus_target->grab_focus(), now using the same logic with safe accesses
to focus_target.
This commit is contained in:
PouleyKetchoupp 2020-10-09 11:20:38 +02:00
parent 67135f246e
commit 4686200f0e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/main/window.cpp
View file

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