From ba5e996d7d0a807cd3970a63837a2027f4c7b650 Mon Sep 17 00:00:00 2001
From: Sreedeep Moulik <sreedeep.m@samsung.com>
Date: Sun, 14 Jul 2013 13:10:11 +0530
Subject: [PATCH] Fix for N_SE-46154

Change-Id: Iac0ad1f52f474afa32515783e6cb429b658990ad
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>
---
 src/ui/controls/FUiCtrl_ListViewItem.cpp | 10 ++++++++--
 src/ui/inc/FUiCtrl_ListViewItem.h        |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp
index 5abc71d..3ae7fca 100644
--- a/src/ui/controls/FUiCtrl_ListViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp
@@ -72,6 +72,7 @@ _ListViewItem::_ListViewItem(float itemHeight)
 	, __prevTouchPos(-1.0f, -1.0f)
 	, __pTextSlideTimer(null)
 	, __pAccessibilityElement(null)
+	, __isContextItemListenerActivated(false)
 {
 	GET_COLOR_CONFIG(TABLEVIEW::ITEM_DESCRIPTION_TEXT_NORMAL, __descriptionTextColor);
 
@@ -109,8 +110,12 @@ _ListViewItem::~_ListViewItem(void)
 	_ListViewContextItem* pContextItem = static_cast<_ListViewContextItem*>(GetContextItem());
 	if ((pContextItem != null) && (__pContextItemEventListener != null))
 	{
-		pContextItem->RemoveContextItemEventListener(*__pContextItemEventListener);
+		if (__isContextItemListenerActivated)
+		{
+			pContextItem->RemoveContextItemEventListener(*__pContextItemEventListener);
+		}
 		__pContextItemEventListener = null;
+		__isContextItemListenerActivated = false;
 	}
 
 	_AccessibilityContainer* pContainer = GetAccessibilityContainer();
@@ -999,11 +1004,12 @@ _ListViewItem::SetContextItemActivationState(bool activate)
 		if (activate)
 		{
 			pContextItem->AddContextItemEventListener(*__pContextItemEventListener);
+			__isContextItemListenerActivated = true;
 		}
 		else
 		{
 			pContextItem->RemoveContextItemEventListener(*__pContextItemEventListener);
-			__pContextItemEventListener = null;
+			__isContextItemListenerActivated = false;
 		}
 	}
 }
diff --git a/src/ui/inc/FUiCtrl_ListViewItem.h b/src/ui/inc/FUiCtrl_ListViewItem.h
index bc031c3..8e34b11 100644
--- a/src/ui/inc/FUiCtrl_ListViewItem.h
+++ b/src/ui/inc/FUiCtrl_ListViewItem.h
@@ -339,6 +339,8 @@ private:
 	_IActionEventListener* __pContextItemEventListener;
 
 	Tizen::Ui::_AccessibilityElement* __pAccessibilityElement;
+
+	bool __isContextItemListenerActivated;
 }; // _ListViewItem
 
 }}} // Tizen::Ui::Controls
-- 
2.7.4