Merge "Fix for N_SE-43296: Removing ContextItemEventListener on Item Delete" into...

diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp
index 7ab3984..b06b46b 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp
@@ -106,6 +106,12 @@ _ListViewItem::~_ListViewItem(void)
                __pDivider = null;
        }
 
+       _ListViewContextItem* pContextItem = static_cast<_ListViewContextItem*>(GetContextItem());
+       if ((pContextItem != null) && (__pContextItemEventListener != null))
+       {
+               pContextItem->RemoveContextItemEventListener(*__pContextItemEventListener);
+       }
+
        _AccessibilityContainer* pContainer = GetAccessibilityContainer();
 
        if ((__pAccessibilityElement != null) && (pContainer != null))