Fixed Jira issues 50249, 50683, 50387

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

diff --git a/src/MpArtistListEditorPanel.cpp b/src/MpArtistListEditorPanel.cpp
index 68ce57a..ac7c3f1 100644 (file)
--- a/src/MpArtistListEditorPanel.cpp
+++ b/src/MpArtistListEditorPanel.cpp
@@ -151,6 +151,30 @@ ArtistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
 
        UpdateContentEditScreenState();
 
+       if (previousSceneId.Equals(IDSCN_PLAYLIST_CREATOR, true))
+       {
+               if (pArgs != null)
+               {
+                       int totalCount = 0;
+                       __pContentTableView->UpdateTableView();
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
+
+                       totalCount = __pPresentationModel->GetArtistListCount();
+                       for (int count = 0; count < totalCount; count++)
+                       {
+                               __pContentTableView->SetItemChecked(count, false);
+                       }
+               }
+               else
+               {
+                       if (pFooter != null)
+                       {
+                               CommonUtil::SetFooterItemEnabled(*pFooter, true);
+                       }
+               }
+       }
+
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
@@ -165,21 +189,23 @@ ArtistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
 {
        AppLogDebug("ENTER");
        ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
-
-       Footer* pFooter = GetFooter();
-       if (pFooter != null)
+       if (!(nextSceneId.Equals(IDSCN_PLAYLIST_CREATOR, false)))
        {
-               pFooter->RemoveAllButtons();
-               pFooter->RemoveAllItems();
-               pFooter->RemoveActionEventListener(*this);
-       }
+               Footer* pFooter = GetFooter();
+               if (pFooter != null)
+               {
+                       pFooter->RemoveAllButtons();
+                       pFooter->RemoveAllItems();
+                       pFooter->RemoveActionEventListener(*this);
+               }
 
-       __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBallonTooltip(__checkedItemCount);
-       int totalCount = __pPresentationModel->GetArtistListCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               __pContentTableView->SetItemChecked(iCount, false);
+               __checkedItemCount = INIT_VALUE;
+               SetCheckedCountBallonTooltip(__checkedItemCount);
+               int totalCount = __pPresentationModel->GetArtistListCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       __pContentTableView->SetItemChecked(iCount, false);
+               }
        }
        CancelAllThumbnailRequest();
        AppLogDebug("EXIT");