[EGIT] [core/enlightenment] master 09/11: handle pixmap_refresh() failure cases more accurately under wayland

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit aba6687b3068d0e59a3fe7578a8c6a81288081bb
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jan 13 11:35:26 2017 -0500

    handle pixmap_refresh() failure cases more accurately under wayland
    
    non-usable pixmaps here are still valid in some cases, such as when
    no buffer is attached
---
 src/bin/e_pixmap.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index bbc82fa..c4b895e 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -457,11 +457,6 @@ e_pixmap_refresh(E_Pixmap *cp)
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
 
-   if (!cp->usable)
-     {
-        cp->failures++;
-        return EINA_FALSE;
-     }
    if (!cp->dirty) return EINA_TRUE;
    switch (cp->type)
      {
@@ -472,6 +467,11 @@ e_pixmap_refresh(E_Pixmap *cp)
            int pw, ph;
            E_Comp_X_Client_Data *cd = NULL;
 
+           if (!cp->usable)
+             {
+                cp->failures++;
+                return EINA_FALSE;
+             }
            pixmap = ecore_x_composite_name_window_pixmap_get(cp->parent ?: 
(Ecore_X_Window)cp->win);
            if (cp->client)
              {

--