From: Enlightenment S. <no-...@en...> - 2012-08-21 08:41:10
|
Log: evas: put back the test on dead object in the right way. Author: cedric Date: 2012-08-21 01:41:02 -0700 (Tue, 21 Aug 2012) New Revision: 75492 Trac: http://trac.enlightenment.org/e/changeset/75492 Modified: trunk/evas/src/lib/canvas/evas_object_image.c Modified: trunk/evas/src/lib/canvas/evas_object_image.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_image.c 2012-08-21 08:06:53 UTC (rev 75491) +++ trunk/evas/src/lib/canvas/evas_object_image.c 2012-08-21 08:41:02 UTC (rev 75492) @@ -447,18 +447,18 @@ return EINA_FALSE; MAGIC_CHECK_END(); -// if (obj->delete_me) -// { -// WRN("Setting deleted object %p as image source %p", src, obj); -// return EINA_FALSE; -// } + if (obj->delete_me && src) + { + WRN("Setting deleted object %p as image source %p", src, obj); + return EINA_FALSE; + } if (src) { -// if (src->delete_me) -// { -// WRN("Setting object %p to deleted image source %p", src, obj); -// return EINA_FALSE; -// } + if (src->delete_me) + { + WRN("Setting object %p to deleted image source %p", src, obj); + return EINA_FALSE; + } if (!src->layer) { CRIT("No evas surface associated with source object (%p)", obj); |