[mutter] backend-x11: Don't assert on something that might happen
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backend-x11: Don't assert on something that might happen
- Date: Mon, 10 Aug 2015 15:01:15 +0000 (UTC)
commit cba2ab445e9f1b23de979917981ee1f3912d08fb
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Aug 10 15:42:35 2015 +0200
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.
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 99727fd..c576601 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]