--- a/locationdataharvester/mylocationsengine/src/calendernotification.cpp	Thu May 27 12:49:34 2010 +0300
+++ b/locationdataharvester/mylocationsengine/src/calendernotification.cpp	Fri Jun 11 13:33:47 2010 +0300
@@ -89,10 +89,7 @@
 //
 CCalenderNotification::~CCalenderNotification()
 {
-    if (IsActive())
-    {
-        Cancel();
-    }
+    Cancel();
     iFsession.Close();
 }
 // -----------------------------------------------------------------------------
@@ -104,10 +101,6 @@
 {
     TInt status;
     iNotifyChange.NotifyChangeL( status );
-    if ( KErrNone == status )
-    {
-        iFsession.NotifyChangeCancel();
-    }
 }
 // -----------------------------------------------------------------------------
 // CMyLocationsEngine::DoCancel()
@@ -116,6 +109,7 @@
 //
 void CCalenderNotification::DoCancel()
 {
+    iFsession.NotifyChangeCancel();
 }
 
 //End of file