From 4771d25e9fb9b8c4b060c9846254e736ecc562a1 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 14 Aug 2014 19:36:40 +0900 Subject: [PATCH] edje swallow resize handling this fixes some deadcode in CID 1039646 that suggests we should do a check for rp->typedata.swallow first before we go using it. --- src/lib/edje/edje_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 9af7222..9e24eea 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -5008,11 +5008,11 @@ _edje_object_part_swallow_image_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_ Evas_Map *map; if (!rp->chosen_description->map.on) return; + if (rp->type != EDJE_RP_TYPE_SWALLOW) return; + if (!rp->typedata.swallow) return; if (evas_object_image_source_get(rp->typedata.swallow->swallowed_object)) return; - if ((rp->type != EDJE_RP_TYPE_SWALLOW) || - (!rp->typedata.swallow)) return; map = (Evas_Map *)evas_object_map_get(rp->typedata.swallow->swallowed_object); if (!map) return; -- 2.7.4