fixed issue 38781

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

diff --git a/inc/GlTimerBase.h b/inc/GlTimerBase.h
index 52d2ace..0eeefaf 100644 (file)
--- a/inc/GlTimerBase.h
+++ b/inc/GlTimerBase.h
@@ -43,6 +43,7 @@ public:
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
+       int GetMovedCount() const;
 
 protected:
        virtual Tizen::Base::Collection::IList* TimerStart(void) = 0;

diff --git a/src/GlFileMoveTimer.cpp b/src/GlFileMoveTimer.cpp
index 1522224..2e3a808 100644 (file)
--- a/src/GlFileMoveTimer.cpp
+++ b/src/GlFileMoveTimer.cpp
@@ -94,7 +94,8 @@ result FileMoveTimer::TimerExpired(const Object* contentId)
 void FileMoveTimer::TimerCancel(int, enum FileActionCancelRes res)
 {
        AppLogDebug("ENTER");
-       if (res == CANCEL_USER)
+
+       if (res == CANCEL_USER || (res == CANCEL_SYS_ERROR && GetMovedCount() > 0) )
        {
                String albumName = __pPresentationModel->ConvertToAlbumName(__moveToDir);
 

diff --git a/src/GlTimerBase.cpp b/src/GlTimerBase.cpp
index 60ec455..d7a97c1 100644 (file)
--- a/src/GlTimerBase.cpp
+++ b/src/GlTimerBase.cpp
@@ -141,6 +141,10 @@ GlTimerBase::OnActionPerformed(const Control& source, int actionId)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
+int GlTimerBase::GetMovedCount() const
+{
+       return __moveToCount;
+}
 
 void GlTimerBase::OnOpCancelled(enum FileActionCancelRes res)
 {