--- a/calendarui/controller/src/calenlocationui.cpp Tue May 11 16:12:24 2010 +0300
+++ b/calendarui/controller/src/calenlocationui.cpp Tue May 25 12:41:10 2010 +0300
@@ -77,6 +77,15 @@
CCalenLocationUi::~CCalenLocationUi()
{
TRACE_ENTRY_POINT;
+ if(iMapView)
+ {
+ iMapView->Cancel();
+ iMapView->ResetLandmarksToShow();
+ delete iMapView;
+ iMapView = NULL;
+ }
+ ReleaseLandmarkResources();
+
if(iLocationSelector)
{
delete iLocationSelector;
@@ -252,6 +261,16 @@
case ECalenNotifyCancelMapLaunch:
{
// Cancel any pending async requests
+
+ if(iMapView)
+ {
+ iMapView->Cancel();
+ iMapView->ResetLandmarksToShow();
+ delete iMapView;
+ iMapView = NULL;
+ }
+ ReleaseLandmarkResources();
+
iLocationSelector->DoCancel();
if(iProvider)
{