mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: 4c70280592 ("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>
This commit is contained in:
Tomeu Vizoso 2018-05-07 15:42:37 +02:00 committed by Gerd Hoffmann
parent 1d18774579
commit 4f4cb8282d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/gtk.c
View File

@ -2484,7 +2484,7 @@ static void early_gtk_display_init(DisplayOptions *opts)
if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
gtk_use_gl_area = true; gtk_use_gl_area = true;
gtk_gl_area_init(); gtk_gl_area_init();
} } else
#endif #endif
{ {
gtk_egl_init(); gtk_egl_init();