Merge "Back key enabled for popup" into tizen_2.2

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index 4c76280..3d0151b 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -327,7 +327,7 @@ AlbumNameEditorForm::OnRenameAlbum(String& strOri)
        else
        {
                //Add a popup here
-               Rectangle clientRect= GetClientAreaBounds();
+               Rectangle clientRect = GetClientAreaBounds();
                Rectangle rect(0, 0, clientRect.width, clientRect.height);
                __pProgressAnim = new (std::nothrow) ProgressAnimation;
                __pProgressAnim->Construct(rect);
@@ -467,6 +467,14 @@ void
 AlbumNameEditorForm::OnFormBackRequested(Form& source)
 {
        AppLogDebug("ENTER");
+       if (__pProgressAnim != null)
+       {
+               if (__pProgressAnim->GetShowState())
+               {
+                       return;
+               }
+       }
+
        if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_CREATE)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();