[mutter/wip/carlosg/xwayland-on-demand: 18/32] core: Separate checks for pointer barriers availability

[Carlos Garnacho <carlosg src gnome org>]

commit 511846e0e8ad9e5693a4cde584e558610cb865bd
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.

 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 826d0ae7e..2027af48a 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2593,8 +2593,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 ();