isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-28 06:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend-x11: Don't assert on something that might happen

Browse Source 
While we shouldn't normally receive crossing events for any windows
except the stage when running nested, we do in case we hold a pointer
grab - just ignore those events instead of taking down the user's
session.
This commit is contained in:
Florian Müllner 2015-08-10 15:42:35 +02:00
parent 038f828ab1
commit cba2ab445e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/x11/meta-backend-x11.c
View File

@ -155,10 +155,9 @@ translate_crossing_event (MetaBackendX11 *x11,
} }
Window stage_window = meta_backend_x11_get_xwindow (x11); Window stage_window = meta_backend_x11_get_xwindow (x11);
if (enter_event->event != stage_window) if (enter_event->event != stage_window &&
priv->mode == META_BACKEND_X11_MODE_COMPOSITOR)
{ {
/* See above for the rationale for this... */
g_assert (priv->mode == META_BACKEND_X11_MODE_COMPOSITOR);
enter_event->event = meta_backend_x11_get_xwindow (x11); enter_event->event = meta_backend_x11_get_xwindow (x11);
enter_event->event_x = enter_event->root_x; enter_event->event_x = enter_event->root_x;
enter_event->event_y = enter_event->root_y; enter_event->event_y = enter_event->root_y;