Fixed jira issues : N_SE-56423, N_SE-56330, N_SE-56326

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

diff --git a/src/MpPlaylistCreatorForm.cpp b/src/MpPlaylistCreatorForm.cpp
index b62c900..7e778d9 100644 (file)
--- a/src/MpPlaylistCreatorForm.cpp
+++ b/src/MpPlaylistCreatorForm.cpp
@@ -26,6 +26,7 @@
 #include "MpCommonUtil.h"
 #include "MpPlaylistCreatorForm.h"
 #include "MpPlaylistEditorPresentationModel.h"
+#include "MpPlaylistListPresentationModel.h"
 #include "MpResourceManager.h"
 #include "MpSceneRegister.h"
 #include "MpTypes.h"
@@ -495,6 +496,15 @@ PlaylistCreatorForm::OnMusicContentUpdateCompleted(void)
                                                                pSceneManager->DestroyScene(scenId);
                                                        }
                                                }
+                                               else if ((sceneIndex == pSceneList->GetCount()-1)
+                                                               && (__previousSceneId.Equals(IDSCN_PLAYLIST_CONTENT_LIST,true)))
+                                               {
+                                                       PlaylistListPresentationModel* pListPresentationModel = PlaylistListPresentationModel::GetInstance();
+                                                       if (pListPresentationModel->GetContentCount() ==0)
+                                                       {
+                                                               pSceneManager->DestroyScene(scenId);
+                                                       }
+                                               }
                                                else
                                                {
                                                        pSceneManager->AddToSceneHistory(scenId);