[mutter/wip/carlosg/x11less-preparations: 4/18] core: Separate checks for pointer barriers availability
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/x11less-preparations: 4/18] core: Separate checks for pointer barriers availability
- Date: Mon, 25 Feb 2019 18:09:22 +0000 (UTC)
commit b8da69cc88f65f3a15b625fc5a1cd455bee84d17
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Dec 30 13:34:06 2018 +0100
core: Separate checks for pointer barriers availability
If the check happens on --nested (X11 backend) while there is no X11
display we would get a crash. Since the barriers are non-effective on
nested, just take it out into a separate condition.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/420
src/core/display.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 3c939295e..8f8fd3029 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2589,8 +2589,10 @@ meta_display_supports_extended_barriers (MetaDisplay *display)
if (META_IS_BACKEND_X11 (meta_get_backend ()))
{
- return (META_X11_DISPLAY_HAS_XINPUT_23 (display->x11_display) &&
- !meta_is_wayland_compositor());
+ if (meta_is_wayland_compositor())
+ return FALSE;
+
+ return META_X11_DISPLAY_HAS_XINPUT_23 (display->x11_display);
}
g_assert_not_reached ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]