Fixed the force close issue when come back from other appcontrol

Change-Id: I79437ea414ca8b9b57f5fd9af90d5da65ae8ed4b

diff --git a/inc/MpMusicPlayerApp.h b/inc/MpMusicPlayerApp.h
index 0b5c38d..05eb7fd 100644 (file)
--- a/inc/MpMusicPlayerApp.h
+++ b/inc/MpMusicPlayerApp.h
@@ -74,7 +74,7 @@ public:
 private:
        void ParsingArgument(const Tizen::Base::String* pUriData, const Tizen::Base::Collection::IMap* pArgs);
        void ReStartContentUpdateTimer(void);
-       void CallContentUpdate(void);
+       void CallOnMusicContentUpdateCompleted(void);
 
        void ShowContentUpdateInProgressPopup(void);
        void HideContentUpdateInProgressPopup(void);

diff --git a/src/MpMusicPlayerApp.cpp b/src/MpMusicPlayerApp.cpp
index 923b6cf..a6bfb22 100644 (file)
--- a/src/MpMusicPlayerApp.cpp
+++ b/src/MpMusicPlayerApp.cpp
@@ -135,7 +135,11 @@ MusicPlayerApp::OnAppInitialized(void)
        {
                __sceneId = IDSCN_ALL_LIST;
        }
-       __pMainFrame->GoToInitialScene(__sceneId, __pDataList);
+       r = __pMainFrame->GoToInitialScene(__sceneId, __pDataList);
+       if (r == E_SUCCESS)
+       {
+               __pDataList = null;
+       }
 
        AppLogDebug("EXIT");
        return true;
@@ -223,7 +227,7 @@ MusicPlayerApp::OnForeground(void)
 //                     pBaseForm->OnMusicContentUpdateCompleted();
 //             }
 //     }
-/*     PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
+       PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
        if (pScene->GetSceneId() == IDSCN_PLAYER)
        {
                if (pBaseForm && __pDataList != null)
@@ -233,9 +237,13 @@ MusicPlayerApp::OnForeground(void)
        }
        else
        {
-               __pMainFrame->GoToInitialScene(pSceneManager->GetCurrentSceneId(), __pDataList);
+               result r = __pMainFrame->GoToInitialScene(pSceneManager->GetCurrentSceneId(), __pDataList);
+               if (r == E_SUCCESS)
+               {
+                       __pDataList = null;
+               }
        }
-*/
+
        Frame* pFrame = GetFrameAt(0);
        AppAssert(pFrame);
        pFrame->SetEnabled(true);
@@ -520,13 +528,13 @@ MusicPlayerApp::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                return;
        }
 
-       CallContentUpdate();
+       CallOnMusicContentUpdateCompleted();
        HideContentUpdateInProgressPopup();
        AppLogDebug("EXIT");
 }
 
 void
-MusicPlayerApp::CallContentUpdate(void)
+MusicPlayerApp::CallOnMusicContentUpdateCompleted(void)
 {
        AppLogDebug("ENTER");
        UiApp* pApp = UiApp::GetInstance();