From 9c83f344200a6823cde0ecb3c744e31addc562b4 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Wed, 16 Oct 2013 17:12:50 +0100 Subject: [PATCH] evas smart callback deletion no longer crashes when called during object deletion --- src/lib/evas/canvas/evas_object_smart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index dc3ae1103f..cfdae7f169 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -889,8 +889,9 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - o = eo_data_scope_get(eo_obj, MY_CLASS); if (!event) return NULL; + o = eo_data_scope_get(eo_obj, MY_CLASS); + if (!o) return NULL; const _Evas_Event_Description *event_desc = eina_hash_find(signals_hash_table, event); if (!event_desc) return NULL;