solving nabi issues: 32346 33487

Change-Id: I34b613acabc6bd83e516ab1f421f4e8fed067fb6

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index 048623f..1f4a629 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -118,6 +118,7 @@ AlbumListEditorForm::OnTerminating(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
        r = __pPresentationModel->RemovePresentationModelListener(*this);
+       __pPresentationModel->RemoveContentEventListener(*this);
 
        if (__pDeletePopup != null)
        {

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index 3d4deb6..e5940da 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -325,7 +325,7 @@ AlbumListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel->RemovePresentationModelListener(*this);
-
+       __pPresentationModel->RemoveContentEventListener(*this);
        if (__pContextMenuMore != null)
        {
                delete __pContextMenuMore;

diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp
index 932979d..0459451 100644 (file)
--- a/src/GlAlbumListPresentationModel.cpp
+++ b/src/GlAlbumListPresentationModel.cpp
@@ -715,6 +715,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
                                {
                                        delete pAlbumInfo;
                                }
+                               pAlbumInfo = null;
                        }
                }
 

diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp
index 587a298..bf8acdf 100644 (file)
--- a/src/GlAllListEditorPanel.cpp
+++ b/src/GlAllListEditorPanel.cpp
@@ -167,6 +167,7 @@ AllListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel->RemovePresentationModelListener(*this);
+       __pPresentationModel->RemoveContentEventListener(__pFileListEditorForm);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;

diff --git a/src/GlAllListPanel.cpp b/src/GlAllListPanel.cpp
index 2b84696..fbdd774 100644 (file)
--- a/src/GlAllListPanel.cpp
+++ b/src/GlAllListPanel.cpp
@@ -151,6 +151,13 @@ result
 AllListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST)
+       {
+               FileListForm* pFileListForm = dynamic_cast<FileListForm*>(pSceneManager->GetCurrentScene()->GetForm());
+               __pPresentationModel->RemoveContentEventListener(pFileListForm);
+       }
        __pPresentationModel->RemovePresentationModelListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 

diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp
index 59a88d9..3c76bc2 100644 (file)
--- a/src/GlAllListSelectionPanel.cpp
+++ b/src/GlAllListSelectionPanel.cpp
@@ -124,6 +124,7 @@ AllListSelectionPanel::OnTerminating(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
        __pPresentationModel->RemovePresentationModelListener(*this);
+       __pPresentationModel->RemoveContentEventListener(__pFileListEditorForm);
        if (__pSeletedIndexList != null)
        {
                delete __pSeletedIndexList;

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 702fa38..d138042 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -334,7 +334,7 @@ result
 FileListEditorForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-
+       __pPresentationModel->RemoveContentEventListener(this);
        if (__pContextMenuMore != null)
        {
                __pContextMenuMore->RemoveActionEventListener(*this);