diff mbox series

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

Message ID 20180507134237.14996-1-tomeu.vizoso@collabora.com
State New
Headers show
Series ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed | expand

Commit Message

Tomeu Vizoso May 7, 2018, 1:42 p.m. UTC 
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>
---
 ui/gtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gerd Hoffmann May 15, 2018, 8:36 a.m. UTC | #1 
On Mon, May 07, 2018 at 03:42:37PM +0200, Tomeu Vizoso wrote:
> 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.

Added to ui patch queue.

thanks,
  Gerd
diff mbox series

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index ef5bc42094a3..72e2e246244d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2448,7 +2448,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();