From 83d063692fafcd54d46f9e487b116481025a482e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 18 Oct 2017 20:01:35 +0900 Subject: [PATCH] genlist: Fix crash on item delete See d3440a9867cf67f03f7fea02075f88d0441c92e7 Fixes T6033 --- src/lib/elementary/elm_genlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 767b322d34..fdaa0fa7f7 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -3683,8 +3683,8 @@ _item_del(Elm_Gen_Item *it) { tmp->item->queued = EINA_FALSE; sd->queue = eina_list_remove(sd->queue, tmp); - _item_process(sd, tmp); - _item_process_post(sd, tmp); + if (_item_process(sd, tmp)) + _item_process_post(sd, tmp); } tmp->item->rel = NULL; } @@ -4574,6 +4574,7 @@ _item_process_post(Elm_Genlist_Data *sd, Elm_Gen_Item *it) { Eina_Bool show_me = EINA_FALSE; + EINA_SAFETY_ON_FALSE_RETURN(it && it->item && it->item->block); if (it->item->block->changed) { show_me = _item_block_recalc