diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2018-05-07 15:42:37 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-05-15 10:34:17 +0200 |
| commit | 4f4cb8282df82d43ba6b3c9045a3ac6fc4c4ef09 (patch) | |
| tree | be664fbc58f700ddb9c77f78883871236235de9f /ui/gtk.c | |
| parent | 1d18774579759a8b5046119266626e9fdf9f7c0b (diff) | |
| download | focaccia-qemu-4f4cb8282df82d43ba6b3c9045a3ac6fc4c4ef09.tar.gz focaccia-qemu-4f4cb8282df82d43ba6b3c9045a3ac6fc4c4ef09.zip | |
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: 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>
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |