[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if Gt
From: |
Gerd Hoffmann |
Subject: |
[Qemu-trivial] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed |
Date: |
Tue, 15 May 2018 11:18:54 +0200 |
From: Tomeu Vizoso <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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();
--
2.9.3
- [Qemu-trivial] [PULL 00/10] Ui 20180515 patches, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 01/10] sdl2: move opts assignment into loop, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 08/10] ui: document non-qapi parser cases., Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 05/10] ui: add qapi parser for -display, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 10/10] gtk: disable the F10 menubar key, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 04/10] vnc: add magic cookie to VncState, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed,
Gerd Hoffmann <=
- [Qemu-trivial] [PULL 02/10] gtk: make it possible to hide the menu bar, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 06/10] ui: switch trivial displays to qapi parser, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 09/10] console: use linked list for QemuConsoles, Gerd Hoffmann, 2018/05/15
- [Qemu-trivial] [PULL 07/10] ui: switch gtk display to qapi parser, Gerd Hoffmann, 2018/05/15
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/10] Ui 20180515 patches, Peter Maydell, 2018/05/15