From b64a0b923389fb719b6d8947973c834c0be315cb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 13 Sep 2015 14:18:19 -0400 Subject: [PATCH] wayland: Avoid a crash with GtkGLArea We must not call gdk_wayland_window_attach_image when using GL for drawing, this leads to a crash. https://bugzilla.gnome.org/show_bug.cgi?id=754770 --- gdk/wayland/gdkwindow-wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index d999753422..4c6f30ce35 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1289,7 +1289,8 @@ gdk_wayland_window_show (GdkWindow *window, _gdk_make_event (window, GDK_MAP, NULL, FALSE); - if (impl->cairo_surface) + if (impl->cairo_surface && + _gdk_wayland_is_shm_surface (impl->cairo_surface)) gdk_wayland_window_attach_image (window); }