diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2015-08-10 15:42:35 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2015-08-10 17:00:57 +0200 |
| commit | cba2ab445e9f1b23de979917981ee1f3912d08fb (patch) | |
| tree | d4cf07976504dc414bf684f4885abe5317ee9269 | |
| parent | 038f828ab152a1d96152724adbb47a04a0e235fe (diff) | |
| download | mutter-cba2ab445e9f1b23de979917981ee1f3912d08fb.tar.gz | |
backend-x11: Don't assert on something that might happen
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.
| -rw-r--r-- | src/backends/x11/meta-backend-x11.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c index 99727fd58..c5766016f 100644 --- a/src/backends/x11/meta-backend-x11.c +++ b/src/backends/x11/meta-backend-x11.c @@ -155,10 +155,9 @@ translate_crossing_event (MetaBackendX11 *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_x = enter_event->root_x; enter_event->event_y = enter_event->root_y; |