enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Cleanly handle evas_object_release. 

SVN revision: 34841
This commit is contained in:
Cedric BAIL 2008-06-17 09:04:12 +00:00
parent 9fa6620817
commit 3796312acf
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/evas/src/lib/canvas/evas_render.c
View File

@ -244,12 +244,20 @@ _evas_render_check_pending_objects(Evas_Array *pending_objects, Evas *e)
obj = _evas_array_get(pending_objects, i);
if (!obj->layer) goto clean_stuff;
evas_object_clip_recalc(obj);
is_active = evas_object_is_active(obj);
if (!is_active && !obj->is_active && !obj->render_pre && !obj->rect_del)
if (!is_active &&
!obj->is_active &&
!obj->render_pre &&
!obj->rect_del)
{
ok = 1;
else
goto clean_stuff;
}
if (obj->is_active == is_active)
{
if (obj->changed)
@ -291,6 +299,7 @@ _evas_render_check_pending_objects(Evas_Array *pending_objects, Evas *e)
}
}
clean_stuff:
if (!ok)
{
evas_array_clean(&e->active_objects);
@ -311,7 +320,8 @@ Evas_Bool pending_change(void *data, void *gdata)
Evas_Object *obj;
obj = data;
if (obj->delete_me) return 0;
if (!obj->layer) obj->changed = 0;
if (obj->delete_me) obj->changed = 0;
return obj->changed;
}