Fixed issue 40019

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

diff --git a/inc/GlAllListEditorPanel.h b/inc/GlAllListEditorPanel.h
index 7694e30..bbae3f7 100644 (file)
--- a/inc/GlAllListEditorPanel.h
+++ b/inc/GlAllListEditorPanel.h
@@ -75,6 +75,7 @@ public:
        virtual result OnRequestEmail(void);
        virtual result OnRequestSlideShow(void);
        result OnRequestRotate(RotateMode rotateMode);
+       void CancelUpdateProgress(void);
 
        virtual void OnFileOpInvalidate(enum FileActionMode actionId);
        virtual void OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes);

diff --git a/inc/GlAllListSelectionPanel.h b/inc/GlAllListSelectionPanel.h
index 8233fb7..1393ec8 100644 (file)
--- a/inc/GlAllListSelectionPanel.h
+++ b/inc/GlAllListSelectionPanel.h
@@ -57,6 +57,7 @@ public:
        result OnRequestMoveTo(Tizen::Base::String& destDirectory);
        result OnRequestSlideShow(void);
        result OnRotateRequested(RotateMode rotateMode);
+       void CancelUpdateProgress(void);
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);

diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp
index a5155bc..ac64d42 100644 (file)
--- a/src/GlAllListEditorPanel.cpp
+++ b/src/GlAllListEditorPanel.cpp
@@ -902,3 +902,13 @@ AllListEditorPanel::OnRequestRotate(RotateMode rotateMode)
        }
        return E_SUCCESS;
 }
+
+void AllListEditorPanel::CancelUpdateProgress(void)
+{
+       if( __pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
+       {
+               __pFileUpdateTimer->Cancel();
+               delete __pFileUpdateTimer;
+               __pFileUpdateTimer = null;
+       }
+}

diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp
index 76b5fb6..76b2e50 100644 (file)
--- a/src/GlAllListSelectionPanel.cpp
+++ b/src/GlAllListSelectionPanel.cpp
@@ -767,3 +767,12 @@ AllListSelectionPanel::OnRotateRequested(RotateMode rotateMode)
        return E_SUCCESS;
 }
 
+void AllListSelectionPanel::CancelUpdateProgress(void)
+{
+       if( __pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
+       {
+               __pFileUpdateTimer->Cancel();
+               delete __pFileUpdateTimer;
+               __pFileUpdateTimer = null;
+       }
+}

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index f2126c4..4adca41 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -901,6 +901,23 @@ FileListEditorForm::OnContentUpdated()
                }
        }
 
+       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
+       {
+               AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->CancelUpdateProgress();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+       {
+               AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pSelectionPanel != null)
+               {
+                       pSelectionPanel->CancelUpdateProgress();
+               }
+       }
+
        if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK
                        && pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
        {