Fixed jira issue and fixed prevent issue

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

diff --git a/src/MpArtistListEditorPanel.cpp b/src/MpArtistListEditorPanel.cpp
index 3b92004..d4162ee 100644 (file)
--- a/src/MpArtistListEditorPanel.cpp
+++ b/src/MpArtistListEditorPanel.cpp
@@ -120,13 +120,14 @@ ArtistListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
                                                Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
+       ContentPanel::OnSceneActivatedN(previousSceneId, currentSceneId, null);
+
        Form* pForm = dynamic_cast<Form*>(GetParent());
-       Footer* pFooter = null;
        AppAssert(pForm);
        pForm->SetFormBackEventListener(this);
        SetEditHeaderStyle();
 
-       pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
+       Footer* pFooter = CommonUtil::CreateBackButtonStyleFooter(*pForm, STYLE_ADDTO_DELETE_ADD);
        pFooter->AddActionEventListener(*this);
        pFooter->SetShowState(true);
        CommonUtil::SetFooterItemEnabled(*pFooter, false);
@@ -146,10 +147,9 @@ ArtistListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
                                                                        const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       Form* pForm = dynamic_cast<Form*>(GetParent());
-       AppAssert(pForm);
+       ContentPanel::OnSceneDeactivated(currentSceneId, nextSceneId);
 
-       Footer* pFooter = pForm->GetFooter();
+       Footer* pFooter = GetFooter();
        pFooter->RemoveAllButtons();
        pFooter->RemoveAllItems();
        pFooter->RemoveActionEventListener(*this);