aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-16 19:03:41 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-17 13:10:35 +0900
commit6b03d46d545ec228708ace4bebeff85704f3f1be (patch)
tree7da134880647c4d73782337d3623e7ec55ee0c2c
parentcxx: follow eoid to eo_self rename in cxx generator and bindings (diff)
downloadefl-6b03d46d545ec228708ace4bebeff85704f3f1be.tar.gz
Evas.Image: Fix ERR message (invalid call)
There was an unintended change from a silent return to EINA_SAFETY inside _evas_object_image_free(). This avoids calling the function altogether.
-rw-r--r--src/lib/evas/canvas/evas_object_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 26959bf362..71e0276437 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -241,7 +241,8 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer)
int was_smart_child = 0;
- _evas_object_image_free(eo_obj);
+ if (eo_isa(eo_obj, EVAS_IMAGE_CLASS))
+ _evas_object_image_free(eo_obj);
evas_object_map_set(eo_obj, NULL);
if (obj->map->prev.map) evas_map_free(obj->map->prev.map);
if (obj->map->cache_map) evas_map_free(obj->map->cache_map);