[SM][Mob]Vunerability to crashes removed

Change-Id: I6e1631e201de69474f3753256b3362a41003dbbf
Signed-off-by: Pawel Aksiutowicz <p.aksiutowic@partner.samsung.com>

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
index 2d8b2f4c962196d79f57cf4cd04f8d3610a6d255..175b4fbd800eca0d06ca010da9cff8ecbc615532 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -469,11 +469,9 @@ static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                }
                if (value >= 1 && value <= 90) {
                        smd->selected_sim_limits->custom_mode_interval = value;
-                       elm_genlist_realized_items_update(mobile_genlist);
-
                        write_cycle_info(smd);
-
                        evas_object_del(popup_info.popup);
+                       elm_genlist_realized_items_update(mobile_genlist);
                }
        }
 }
@@ -568,11 +566,9 @@ static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
        }
        if (set_date >= min_date_time_t && set_date <= max_date_time_t) {
                smd->selected_sim_limits->cycle_start = set_date;
-               elm_genlist_realized_items_update(mobile_genlist);
-
                write_cycle_info(smd);
-
                evas_object_del(popup_info.popup);
+               elm_genlist_realized_items_update(mobile_genlist);
        }
 }
 
@@ -768,16 +764,15 @@ static void _radio_cycle_list_item_selected_cb(void *data, Evas_Object *obj,
                elm_radio_value_set(cycle_mode_radio_group,
                        item_data->smd->selected_sim_limits->cycle_mode);
                generate_list(mobile_genlist, item_data->smd);
-               elm_genlist_realized_items_update(mobile_genlist);
        }
 
        if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, _("Set data usage cycle"),
                        item_data->smd->selected_sim_limits->custom_mode_interval);
 
-       evas_object_del(item_data->popup);
-
        write_cycle_info(item_data->smd);
+       evas_object_del(item_data->popup);
+       elm_genlist_realized_items_update(mobile_genlist);
 }
 
 static Elm_Widget_Item *_append_item_to_radio_list(SmartMgrData *smd,
@@ -818,17 +813,17 @@ static void _radio_cycle_selected_cb(void *data, Evas_Object *obj,
                elm_radio_value_set(cycle_mode_radio_group,
                                item_data->smd->selected_sim_limits->cycle_mode);
                generate_list(mobile_genlist, item_data->smd);
-               elm_genlist_realized_items_update(mobile_genlist);
        }
 
        if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, _("Set data usage cycle"),
                                item_data->smd->selected_sim_limits->custom_mode_interval);
 
-       evas_object_del(item_data->popup);
 
-       write_cycle_info(item_data->smd);
 
+       write_cycle_info(item_data->smd);
+       evas_object_del(item_data->popup);
+       elm_genlist_realized_items_update(mobile_genlist);
 }
 
 static Evas_Object *_genlist_cycle_radio_content_get(void *data,
@@ -886,11 +881,9 @@ static void _monthly_start_date_popup_done_cb(void *data, Evas_Object *obj,
 
        smd->selected_sim_limits->cycle_start =
                        elm_spinner_value_get(popup_info.content);
-       elm_genlist_realized_items_update(mobile_genlist);
-
        write_cycle_info(smd);
-
        evas_object_del(popup_info.popup);
+       elm_genlist_realized_items_update(mobile_genlist);
 }
 
 static void _create_monthly_start_date_popup(void *data, Evas_Object *obj,
@@ -933,11 +926,9 @@ static void _radio_start_weekday_list_item_selected_cb(void *data,
        elm_radio_value_set(start_weekday_radio_group,
                item_data->smd->selected_sim_limits->cycle_start);
 
-       elm_genlist_realized_items_update(mobile_genlist);
-
-       evas_object_del(item_data->popup);
-
        write_cycle_info(item_data->smd);
+       evas_object_del(item_data->popup);
+       elm_genlist_realized_items_update(mobile_genlist);
 }
 
 static void _radio_start_weekday_selected_cb(void *data, Evas_Object *obj,
@@ -949,9 +940,8 @@ static void _radio_start_weekday_selected_cb(void *data, Evas_Object *obj,
        elm_radio_value_set(start_weekday_radio_group,
                item_data->smd->selected_sim_limits->cycle_start);
 
-       elm_genlist_realized_items_update(mobile_genlist);
-
        evas_object_del(item_data->popup);
+       elm_genlist_realized_items_update(mobile_genlist);
 }
 
 static Evas_Object *_genlist_start_weekday_radio_content_get(void *data,