summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-01-13 11:35:26 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-01-13 11:35:20 -0500
commitaba6687b3068d0e59a3fe7578a8c6a81288081bb (patch)
treed18ee6862679b6f9372953ddea1184abeae35225
parent27091c510cf22ba7b4b002cba872dca3f9022009 (diff)
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
-rw-r--r--src/bin/e_pixmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index bbc82fae9..c4b895eea 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -457,11 +457,6 @@ e_pixmap_refresh(E_Pixmap *cp)
457 457
458 EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); 458 EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
459 459
460 if (!cp->usable)
461 {
462 cp->failures++;
463 return EINA_FALSE;
464 }
465 if (!cp->dirty) return EINA_TRUE; 460 if (!cp->dirty) return EINA_TRUE;
466 switch (cp->type) 461 switch (cp->type)
467 { 462 {
@@ -472,6 +467,11 @@ e_pixmap_refresh(E_Pixmap *cp)
472 int pw, ph; 467 int pw, ph;
473 E_Comp_X_Client_Data *cd = NULL; 468 E_Comp_X_Client_Data *cd = NULL;
474 469
470 if (!cp->usable)
471 {
472 cp->failures++;
473 return EINA_FALSE;
474 }
475 pixmap = ecore_x_composite_name_window_pixmap_get(cp->parent ?: (Ecore_X_Window)cp->win); 475 pixmap = ecore_x_composite_name_window_pixmap_get(cp->parent ?: (Ecore_X_Window)cp->win);
476 if (cp->client) 476 if (cp->client)
477 { 477 {