[EGIT] [core/enlightenment] master 01/01: fix pixmap image clearing based on pixmap type

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=14f44ef6e3c9ae0831cb32b5b12a1440724b675e

commit 14f44ef6e3c9ae0831cb32b5b12a1440724b675e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 16 14:34:54 2015 -0400

    fix pixmap image clearing based on pixmap type
    
    !@%!@$#!# borkerhorns!!!!!!
    
    invalidates T2291
---
 src/bin/e_pixmap.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index a558e91..7be5534 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -601,10 +601,12 @@ e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache)
    if (!cache)
      {
 #ifndef HAVE_WAYLAND_ONLY
-        if (!cp->image) return;
+        if (e_pixmap_is_x(cp))
+          if (!cp->image) return;
 #endif
-#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
-        if (!cp->buffer_ref.buffer) return;
+#ifdef HAVE_WAYLAND
+        if (cp->type == E_PIXMAP_TYPE_WL)
+          if (!cp->buffer_ref.buffer) return;
 #endif
      }
 

--