asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #85418 from bruvzg/fix_crash_on_late_enterexit

Browse source 
Fix crash on late mouse enter/exit event arrival.
This commit is contained in:
Rémi Verschelde 2023-11-27 16:01:30 +01:00
commit a807d4bfa7
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/main/window.cpp
View file

@ -681,6 +681,9 @@ void Window::_propagate_window_notification(Node *p_node, int p_notification) {
void Window::_event_callback(DisplayServer::WindowEvent p_event) { void Window::_event_callback(DisplayServer::WindowEvent p_event) {
switch (p_event) { switch (p_event) {
case DisplayServer::WINDOW_EVENT_MOUSE_ENTER: { case DisplayServer::WINDOW_EVENT_MOUSE_ENTER: {
if (!is_inside_tree()) {
return;
}
Window *root = get_tree()->get_root(); Window *root = get_tree()->get_root();
if (root->gui.windowmanager_window_over) { if (root->gui.windowmanager_window_over) {
#ifdef DEV_ENABLED #ifdef DEV_ENABLED
@ -696,6 +699,9 @@ void Window::_event_callback(DisplayServer::WindowEvent p_event) {
} }
} break; } break;
case DisplayServer::WINDOW_EVENT_MOUSE_EXIT: { case DisplayServer::WINDOW_EVENT_MOUSE_EXIT: {
if (!is_inside_tree()) {
return;
}
Window *root = get_tree()->get_root(); Window *root = get_tree()->get_root();
if (!root->gui.windowmanager_window_over) { if (!root->gui.windowmanager_window_over) {
#ifdef DEV_ENABLED #ifdef DEV_ENABLED