Fixed Jira issues 50249, 50683, 50387

[apps/osp/MusicPlayer.git] / src / MpArtistContentListForm.cpp

diff --git a/src/MpArtistContentListForm.cpp b/src/MpArtistContentListForm.cpp
index 0764f74..fcfd618 100644 (file)
--- a/src/MpArtistContentListForm.cpp
+++ b/src/MpArtistContentListForm.cpp
@@ -134,15 +134,21 @@ ArtistContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        AppLogDebug("ENTER");
        if (pArgs != null)
        {
-               __prevSceneId.Clear();
-               __headerTitle.Clear();
-               __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
-               __headerTitle.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME)));
-               __artistName = __headerTitle;
-               __pPresentationModel->UpdateArtistList();
-               __pPresentationModel->InitializeArtistAlbumList(__artistName);
-               __pPresentationModel->InitializeContentList(INIT_VALUE);
-
+               if (previousSceneId.Equals(IDSCN_PLAYLIST_CREATOR, false))
+               {
+                       SetItemCheckedAll(false);
+               }
+               else
+               {
+                       __prevSceneId.Clear();
+                       __headerTitle.Clear();
+                       __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
+                       __headerTitle.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME)));
+                       __artistName = __headerTitle;
+                       __pPresentationModel->UpdateArtistList();
+                       __pPresentationModel->InitializeArtistAlbumList(__artistName);
+                       __pPresentationModel->InitializeContentList(INIT_VALUE);
+               }
                SetHeader();
                UpdateScreenState();
                UpdateTableView();