From 554ec43cba2d010b4ecda2a4dc2d2a76b0faadbf Mon Sep 17 00:00:00 2001 From: Divya Darshini Date: Mon, 15 Apr 2013 10:41:08 +0530 Subject: [PATCH] solving nabi issues: 32346 33487 Change-Id: I34b613acabc6bd83e516ab1f421f4e8fed067fb6 --- src/GlAlbumListEditorForm.cpp | 1 + src/GlAlbumListForm.cpp | 2 +- src/GlAlbumListPresentationModel.cpp | 1 + src/GlAllListEditorPanel.cpp | 1 + src/GlAllListPanel.cpp | 7 +++++++ src/GlAllListSelectionPanel.cpp | 1 + src/GlFileListEditorForm.cpp | 2 +- 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp index 048623f..1f4a629 100644 --- 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 --- 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 --- 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 --- 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 --- 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(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 --- 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 --- 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); -- 2.7.4