equal
deleted
inserted
replaced
75 // ---------------------------------------------------------------------------- |
75 // ---------------------------------------------------------------------------- |
76 // |
76 // |
77 CCalenLocationUi::~CCalenLocationUi() |
77 CCalenLocationUi::~CCalenLocationUi() |
78 { |
78 { |
79 TRACE_ENTRY_POINT; |
79 TRACE_ENTRY_POINT; |
|
80 if(iMapView) |
|
81 { |
|
82 iMapView->Cancel(); |
|
83 iMapView->ResetLandmarksToShow(); |
|
84 delete iMapView; |
|
85 iMapView = NULL; |
|
86 } |
|
87 ReleaseLandmarkResources(); |
|
88 |
80 if(iLocationSelector) |
89 if(iLocationSelector) |
81 { |
90 { |
82 delete iLocationSelector; |
91 delete iLocationSelector; |
83 } |
92 } |
84 |
93 |
250 } |
259 } |
251 break; |
260 break; |
252 case ECalenNotifyCancelMapLaunch: |
261 case ECalenNotifyCancelMapLaunch: |
253 { |
262 { |
254 // Cancel any pending async requests |
263 // Cancel any pending async requests |
|
264 |
|
265 if(iMapView) |
|
266 { |
|
267 iMapView->Cancel(); |
|
268 iMapView->ResetLandmarksToShow(); |
|
269 delete iMapView; |
|
270 iMapView = NULL; |
|
271 } |
|
272 ReleaseLandmarkResources(); |
|
273 |
255 iLocationSelector->DoCancel(); |
274 iLocationSelector->DoCancel(); |
256 if(iProvider) |
275 if(iProvider) |
257 { |
276 { |
258 delete iProvider; |
277 delete iProvider; |
259 iProvider = NULL; |
278 iProvider = NULL; |