From 3125c3a67498bd38326f4afdc1e58855f144ca87 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 30 Jan 2014 12:09:43 -0500 Subject: [PATCH] fix more misuses of comp animating flag this should even things out permanently here and ensure things get deleted when they should related: T879 --- src/bin/e_comp_object.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 2e659a6fc..4a4ecf4c6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1153,12 +1153,9 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj) else { e_comp_object_signal_emit(obj, "e,state,hidden", "e"); - if (!cw->animating) - { - cw->comp->animating++; - cw->animating = 1; - e_object_ref(E_OBJECT(cw->ec)); - } + cw->comp->animating++; + cw->animating++; + e_object_ref(E_OBJECT(cw->ec)); } cw->defer_hide = !!cw->animating; if (!cw->animating) @@ -1835,12 +1832,9 @@ _e_comp_smart_show(Evas_Object *obj) else { e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e"); - if (!cw->animating) - { - cw->comp->animating++; - cw->animating = 1; - e_object_ref(E_OBJECT(cw->ec)); - } + cw->comp->animating++; + cw->animating++; + e_object_ref(E_OBJECT(cw->ec)); } if (!cw->animating) e_comp_object_effect_set(obj, NULL);