diff mbox series

[PULL,03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed

Message ID 20180515091901.27774-4-kraxel@redhat.com
State Accepted
Commit 4f4cb8282df82d43ba6b3c9045a3ac6fc4c4ef09
Headers show
Series None | expand

Commit Message

Gerd Hoffmann May 15, 2018, 9:18 a.m. UTC 
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>


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: 4c70280592f5 ("ui/gtk: use GtkGlArea on wayland only")
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Message-id: 20180507134237.14996-1-tomeu.vizoso@collabora.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---
 ui/gtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.3
diff mbox series

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index 9e5390f2c2..568c9563ce 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -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();