godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix Popup crash in single window mode
This commit is contained in:
Rémi Verschelde 2020-10-09 12:21:31 +02:00 committed by GitHub
parent 6dc41b3ad2 4686200f0e
commit cb9bf98bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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) { if (exclusive_child != nullptr) {
Window *focus_target = exclusive_child; 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(); 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 if (!is_embedding_subwindows()) { //not embedding, no need for event
return; return;