[Prevent] Fixed Prevent issues related to naviframe,genlist and date time module.

Change-Id: Ia2998bc4b49aa00de0354099496616d28c13d316

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 4656645..2f4caf7 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1779,12 +1779,12 @@ elm_naviframe_item_pop(Evas_Object *obj)
         if (!it->pop_cb(it->pop_data, (Elm_Object_Item *)it))
           {
              it->ref--;
+             it->popping = EINA_FALSE;
              if (it->delete_me)
                {
                   _item_del_pre_hook(it);
                   _elm_widget_item_free(it);
                }
-             it->popping = EINA_FALSE;
              evas_object_unref(obj);
 
              return NULL;

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 6c45311..638104b 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3603,11 +3603,9 @@ _multi_cancel(void *data)
 {
    Elm_Genlist_Smart_Data *sd = data;
 
-   if (!sd)
-     {
-        sd->multi_timer = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
+   if (!sd) return ECORE_CALLBACK_CANCEL;
+
+   sd->multi_timer = NULL;
    sd->multi_timeout = EINA_TRUE;
 
    return ECORE_CALLBACK_RENEW;
@@ -4427,8 +4425,8 @@ _scroll_hold_timer_cb(void *data)
 {
    Elm_Genlist_Smart_Data *sd = data;
 
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    sd->scr_hold_timer = NULL;
-   if (!data) return ECORE_CALLBACK_CANCEL;
 
    sd->s_iface->hold_set(ELM_WIDGET_DATA(sd)->obj, EINA_FALSE);
 

diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index e819e54..25c027b 100644 (file)
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -53,8 +53,9 @@ _ctxpopup_relaunch_idler(void *data)
    Ctxpopup_Module_Data *ctx_mod;
 
    ctx_mod = (Ctxpopup_Module_Data *)data;
-   ctx_mod->ctx_relaunch_idler = NULL;
+
    if (!ctx_mod) return ECORE_CALLBACK_CANCEL;
+   ctx_mod->ctx_relaunch_idler = NULL;
 
    _field_clicked_cb(ctx_mod, ctx_mod->sel_field);
    return ECORE_CALLBACK_CANCEL;