Fixed issues 39013, 39036

Change-Id: I5b3e063ad8b259b6bb9a7a0e20b90c76032c9c6a
Signed-off-by: Himanshu Talwar <himanshu.t@samsung.com>

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index bc466b2..f1981c7 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -361,7 +361,7 @@ void AlbumNameEditorForm::OnAlbumRenameComplete(void)
        _overlayMsg = false;
        GetFooter()->SetEnabled(true);
        SceneManager* pSceneManager = SceneManager::GetInstance();
-       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST));
+       pSceneManager->GoBackward((BackwardSceneTransition(IDSCN_ALBUM_LIST)));
 }
 
 void

diff --git a/src/GlFileMoveTimer.cpp b/src/GlFileMoveTimer.cpp
index 2e3a808..064f7ba 100644 (file)
--- a/src/GlFileMoveTimer.cpp
+++ b/src/GlFileMoveTimer.cpp
@@ -111,6 +111,17 @@ void FileMoveTimer::TimerCancel(int, enum FileActionCancelRes res)
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST));
                }
        }
+       else if (res == CANCEL_SYS_ERROR && GetMovedCount() == 0)
+       {
+               if ( __isCopyOperation == true )
+               {
+                       MessageBox messageBox;
+                       messageBox.Construct(L"", L"Unable to copy files.",
+                                       MSGBOX_STYLE_NONE, 3000);
+                       int modalResult;
+                       messageBox.ShowAndWait(modalResult);
+               }
+       }
        AppLogDebug("EXIt");
 }