[TSIX-6494] Resolved Music Chooser App Crash Issue

Change-Id: Ic0025f9e01eb8f5b126f4e8c4216d076960ac58d

diff --git a/music-chooser/src/mc-library-view.c b/music-chooser/src/mc-library-view.c
index 5eeea5c..f3b20b3 100644 (file)
--- a/music-chooser/src/mc-library-view.c
+++ b/music-chooser/src/mc-library-view.c
@@ -39,6 +39,7 @@ enum {
 };
 
 static Elm_Object_Item *g_tab_item[TAB_MAX];
+static Elm_Object_Item *g_tab_item_main[TAB_MAX];
 static Evas_Object *g_ly;
 static Elm_Object_Item *g_navi_it;
 extern bool detail_view;
@@ -58,8 +59,7 @@ static void _all_cb(void *data, Evas_Object * obj, void *event_info)
                elm_naviframe_item_pop(ad->navi_bar);
                ad->track_type = MP_TRACK_ALL;
                detail_view = false;
-               mc_library_view_create(ad);
-               return;
+               elm_toolbar_item_selected_set(g_tab_item_main[TAB_ALL], EINA_TRUE);
        }
 
 
@@ -93,8 +93,7 @@ static void _artist_cb(void *data, Evas_Object * obj, void *event_info)
                elm_naviframe_item_pop(ad->navi_bar);
                ad->track_type = MP_TRACK_BY_ARTIST;
                detail_view = false;
-               mc_library_view_create(ad);
-               return;
+               elm_toolbar_item_selected_set(g_tab_item_main[TAB_ARTIST], EINA_TRUE);
        }
 
        sub_view = elm_object_part_content_unset(g_ly, "list-content");
@@ -125,8 +124,7 @@ static void _album_cb(void *data, Evas_Object * obj, void *event_info)
                elm_naviframe_item_pop(ad->navi_bar);
                ad->track_type = MP_TRACK_BY_ALBUM;
                detail_view = false;
-               mc_library_view_create(ad);
-               return;
+               elm_toolbar_item_selected_set(g_tab_item_main[TAB_ALBUM], EINA_TRUE);
        }
 
        sub_view = elm_object_part_content_unset(g_ly, "list-content");
@@ -183,10 +181,17 @@ Evas_Object *_create_tabbar(Evas_Object * parent, struct app_data * ad)
        g_tab_item[TAB_ALBUM] =
                mc_common_toolbar_item_append(obj, NULL, MC_TEXT_ALBUMS, _album_cb,
                                                                          ad);
+       if(!g_tab_item_main[TAB_ALBUM] && !g_tab_item_main[TAB_ALL]){
+               g_tab_item_main[TAB_ALBUM]=g_tab_item[TAB_ALBUM];
+               g_tab_item_main[TAB_ALL]=g_tab_item[TAB_ALL];
+       }
 #ifdef MC_ENABLE_TAB
        g_tab_item[TAB_ARTIST] =
                mc_common_toolbar_item_append(obj, NULL, MC_TEXT_ARTISTS,
                                                                          _artist_cb, ad);
+       if(!g_tab_item_main[TAB_ARTIST]){
+               g_tab_item_main[TAB_ARTIST]=g_tab_item[TAB_ARTIST];
+       }
 #endif
 
        elm_toolbar_item_selected_set(g_tab_item[selected_tab], EINA_TRUE);