From 84f5c2f608c272cff6096066d94b23e800021a90 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Sun, 25 May 2014 00:45:35 +0100 Subject: [PATCH] add checks for pixmap type being X before accessing the image (for cases where we are running wayland clients) Signed-off-by: Chris Michael --- src/bin/e_pixmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index 5830be327..aca00a13a 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -629,6 +629,7 @@ e_pixmap_image_refresh(E_Pixmap *cp) { case E_PIXMAP_TYPE_X: #ifndef HAVE_WAYLAND_ONLY + if (cp->image) return EINA_TRUE; if ((!cp->visual) || (!cp->client->depth)) return EINA_FALSE; cp->image = ecore_x_image_new(cp->w, cp->h, cp->visual, cp->client->depth); if (cp->image) @@ -654,7 +655,8 @@ e_pixmap_image_exists(const E_Pixmap *cp) EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); #ifndef HAVE_WAYLAND_ONLY - return !!cp->image; + if (cp->type == E_PIXMAP_TYPE_X) + return !!cp->image; #endif #if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) return (cp->resource != NULL);