Merge branch 'guidog/gnome-session-nested-no-x11'

1 files changed, 8 insertions, 0 deletions

diff --git a/tools/gnome-session-check-accelerated.c b/tools/gnome-session-check-accelerated.c
index 344c654e..31f0a525 100644
--- a/tools/gnome-session-check-accelerated.c
+++ b/tools/gnome-session-check-accelerated.c
@@ -157,6 +157,14 @@ main (int argc, char **argv)
         }
 
         display = gdk_display_get_default ();
+        /* when running on X11 with a nested wayland GDK will default to wayland
+         * so looking for X11 atoms will not work (and crash).
+         */
+        if (!GDK_IS_X11_DISPLAY (display)) {
+                g_printerr ("gnome-session-check-accelerated: no X11 display found\n");
+                return 1;
+        }
+
         rootwin = gdk_x11_get_default_root_xwindow ();
 
         is_accelerated_atom = gdk_x11_get_xatom_by_name_for_display (display, "_GNOME_SESSION_ACCELERATED");