[EGIT] [core/elementary] elementary-1.14 01/01: gengrid/genlist: decrement item counter before triggering item del callback

[Mike Blumenkrantz]

discomfitor pushed a commit to branch elementary-1.14.

http://git.enlightenment.org/core/elementary.git/commit/?id=8052d9d4e38fafc4dddb40a19412ff4be867afc6

commit 8052d9d4e38fafc4dddb40a19412ff4be867afc6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu May 28 11:58:46 2015 -0400

    gengrid/genlist: decrement item counter before triggering item del callback
    
    @fix
---
 src/lib/elm_gengrid.c | 3 +--
 src/lib/elm_genlist.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index a538486..1312061 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3296,6 +3296,7 @@ _elm_gengrid_item_del_serious(Elm_Gen_Item *it)
 {
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
 
+   sd->item_count--;
    _elm_gengrid_item_del_not_serious(it);
    sd->items = eina_inlist_remove(sd->items, EINA_INLIST_GET(it));
    if (it->tooltip.del_cb)
@@ -3309,8 +3310,6 @@ _elm_gengrid_item_del_serious(Elm_Gen_Item *it)
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(sd->calc_cb, sd->obj);
 
-   sd->item_count--;
-
    ELM_SAFE_FREE(it->item, free);
 }
 
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index f6e66e0..6594aa0 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3542,6 +3542,7 @@ _elm_genlist_item_del_serious(Elm_Gen_Item *it)
 {
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
+   sd->item_count--;
    _elm_genlist_item_del_not_serious(it);
 
    //(it->walking == -1) means it's already removed from the list.
@@ -3557,8 +3558,6 @@ _elm_genlist_item_del_serious(Elm_Gen_Item *it)
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, sd->obj);
 
-   sd->item_count--;
-
    ELM_SAFE_FREE(it->item, free);
 }
 

--