From a63f1db1294c7f83116ab9cbb623dd4ac672dd7d Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 6 Sep 2012 10:05:34 +0000 Subject: [PATCH] edje: correct NULL check. Happy SeoZ :-) SVN revision: 76235 --- legacy/edje/src/lib/edje_util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index e9ff5620e0..093145be55 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -5083,9 +5083,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp, rp); //If the map is enabled, uv should be updated when image size is changed. - if (rp->swallowed_object && - evas_object_type_get(rp->swallowed_object) && - !strcmp(evas_object_type_get(rp->swallowed_object), "image")) + if (!strcmp(evas_object_type_get(rp->swallowed_object), "image")) evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE, _edje_object_part_swallow_image_resize_cb, rp); @@ -5118,6 +5116,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp, void _edje_real_part_swallow_clear(Edje_Real_Part *rp) { + if (!rp->swallowed_object) return ; evas_object_smart_member_del(rp->swallowed_object); evas_object_event_callback_del_full(rp->swallowed_object, EVAS_CALLBACK_DEL,