Fixed issue 48304

[apps/osp/Gallery.git] / src / GlAlbumNameEditorForm.cpp

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index a6bb664..7779471 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -514,7 +514,7 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
        __pPresentationModel = AlbumListPresentationModel::GetInstance();
        __previousSceneId = previousSceneId;
 
-       __pNameEditField->SetEnabled(true);
+
        __pPresentationModel->AddContentEventListener(this);
 
        if (pArgs != null)
@@ -638,6 +638,12 @@ AlbumNameEditorForm::OnSceneDeactivated(const SceneId& currentSceneId,
                const SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
+
+       if(__pNameEditField->IsEnabled() == false)
+       {
+               __pNameEditField->SetEnabled(true);
+       }
+
        __pPresentationModel->RemoveContentEventListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }