diff -r 2872ae438bf7 -r e538444823de locationmanager/locationtrail/src/ctracklog.cpp --- a/locationmanager/locationtrail/src/ctracklog.cpp Wed Sep 15 12:40:59 2010 +0300 +++ b/locationmanager/locationtrail/src/ctracklog.cpp Wed Oct 13 15:02:02 2010 +0300 @@ -68,7 +68,6 @@ EXPORT_C CTrackLog::~CTrackLog() { delete iGpxConverter; - iGpxConverter = NULL; iFs.Close(); } @@ -202,7 +201,6 @@ if ( err == KErrNone ) { delete lastCoords; - lastCoords = NULL; lastCoords = new TCoordinate( aTrailItem.iLocationData.iPosition ); iBoundaries->distance += distance; } @@ -223,8 +221,6 @@ RFile64 file; RFileWriteStream writer; - CleanupClosePushL( writer ); - TInt err; err = file.Open( iFs, iTmpFileName, EFileRead ); if ( err != KErrNone ) @@ -251,6 +247,8 @@ writer.Sink()->SeekL( MStreamBuf::EWrite, TStreamPos( endpos )); } + CleanupClosePushL( writer ); + TInt count = iTrackLogItemArray.Count(); for( TInt i = 0; i < count; i++ ) @@ -308,9 +306,7 @@ } } delete filename; - filename = NULL; delete files; - files = NULL; } void CTrackLog::ReadCenRepValueL(TInt aKey, TInt& aValue)