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

Merge pull request #45805 from KoBeWi/dispatch_error_of_doom

Browse Source 
Cancel event dispatch on error
This commit is contained in:
Rémi Verschelde
2021-02-07 22:25:37 +01:00
committed by GitHub
parent 57c03a432a b6e2ad0e7e
commit 57e2822a05
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/windows/display_server_windows.cpp
View File

@ -1784,7 +1784,10 @@ void DisplayServerWindows::_dispatch_input_event(const Ref<InputEvent> &p_event)
Ref<InputEventFromWindow> event_from_window = p_event; Ref<InputEventFromWindow> event_from_window = p_event;
if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) { if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
//send to a window //send to a window
ERR_FAIL_COND(!windows.has(event_from_window->get_window_id())); if (!windows.has(event_from_window->get_window_id())) {
in_dispatch_input_event = false;
ERR_FAIL_MSG("DisplayServerWindows: Invalid window id in input event.");
}
Callable callable = windows[event_from_window->get_window_id()].input_event_callback; Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
if (callable.is_null()) { if (callable.is_null()) {
in_dispatch_input_event = false; in_dispatch_input_event = false;