[EGIT] [core/elementary] master 06/08: elm_genlist: reset timer to NULL on cancel only.

[Amitesh Singh]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=6a4d59fed00955a7037dfe7d0f19ee3767e9017b

commit 6a4d59fed00955a7037dfe7d0f19ee3767e9017b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Jun 22 11:59:21 2015 +0200

    elm_genlist: reset timer to NULL on cancel only.
    
    Summary: @fix
    
    Reviewers: raster, seoz, SanghyeonLee
    
    Subscribers: sachin.dev, seoz
    
    Differential Revision: https://phab.enlightenment.org/D2730
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/lib/elm_genlist.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 17bebca..225d095 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3859,10 +3859,9 @@ _long_press_cb(void *data)
    Eina_List *list;
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
-   it->long_timer = NULL;
    if (_is_no_select(it) ||
        eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || 
(it->dragging))
-     return ECORE_CALLBACK_CANCEL;
+     goto end;
 
    sd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
@@ -3897,6 +3896,8 @@ _long_press_cb(void *data)
           edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_ENABLED, "elm");
      }
 
+end:
+   it->long_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
 }
 

--