Commit 4f4cb828 authored by Tomeu Vizoso's avatar Tomeu Vizoso Committed by Gerd Hoffmann
Browse files

ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed 



The commit referenced below changed the logic by causing the gtk-egl
backend to be initialized regardless of whether GtkGlArea initialization
succeeded. This causes eglInitialize to crash in Wayland systems without
XWayland.

This patch restores the previous logic.

Fixes: 4c702805 ("ui/gtk: use GtkGlArea on wayland only")
Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Message-id: 20180507134237.14996-1-tomeu.vizoso@collabora.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 1d187745

ui/gtk.c

+1 −1
Original line number Diff line number Diff line
@@ -2484,7 +2484,7 @@ static void early_gtk_display_init(DisplayOptions *opts) 
        if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {

            gtk_use_gl_area = true;

            gtk_gl_area_init();

        }

        } else

#endif

        {

            gtk_egl_init();