summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-18 20:01:35 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-18 20:01:35 +0900
commit83d063692fafcd54d46f9e487b116481025a482e (patch)
treefa1b372417083801c61a1e8ed5b0435b0b24ef90
parent24c0eced7724f435cec0e5b81e45f1485d08c64e (diff)
genlist: Fix crash on item delete
See d3440a9867cf67f03f7fea02075f88d0441c92e7 Fixes T6033
-rw-r--r--src/lib/elementary/elm_genlist.c5
1 files 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)
3683 { 3683 {
3684 tmp->item->queued = EINA_FALSE; 3684 tmp->item->queued = EINA_FALSE;
3685 sd->queue = eina_list_remove(sd->queue, tmp); 3685 sd->queue = eina_list_remove(sd->queue, tmp);
3686 _item_process(sd, tmp); 3686 if (_item_process(sd, tmp))
3687 _item_process_post(sd, tmp); 3687 _item_process_post(sd, tmp);
3688 } 3688 }
3689 tmp->item->rel = NULL; 3689 tmp->item->rel = NULL;
3690 } 3690 }
@@ -4574,6 +4574,7 @@ _item_process_post(Elm_Genlist_Data *sd, Elm_Gen_Item *it)
4574{ 4574{
4575 Eina_Bool show_me = EINA_FALSE; 4575 Eina_Bool show_me = EINA_FALSE;
4576 4576
4577 EINA_SAFETY_ON_FALSE_RETURN(it && it->item && it->item->block);
4577 if (it->item->block->changed) 4578 if (it->item->block->changed)
4578 { 4579 {
4579 show_me = _item_block_recalc 4580 show_me = _item_block_recalc