N_SE-36744 N_SE-36750 N_SE-36754 N_SE-36743

[apps/osp/MyFiles.git] / src / MfCategorySearch.cpp

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index a787061..f1f482a 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -26,6 +26,8 @@ CategorySearch::CategorySearch(void)
 
 CategorySearch::~CategorySearch(void)
 {
+       DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_STORAGE_CARD, *this);
+
        if (__pHomeButton != null)
        {
                delete __pHomeButton;
@@ -400,6 +402,8 @@ CategorySearch::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScen
        if(_pFileEventManager != null)
                _pFileEventManager->RemovePath(_pathOfSelectedFile);
 
+       DeviceManager::RemoveAllDeviceEventListeners();
+
        if (_pIconListView != null)
        {
                _pIconListView->RemoveGestureDetector(*_pLongPressGestureDetector);