diff -r 55d60436f00b -r d68a4b5d5885 pimappservices/calendar/shared/src/agmrptdef.cpp --- a/pimappservices/calendar/shared/src/agmrptdef.cpp Tue May 11 16:12:24 2010 +0300 +++ b/pimappservices/calendar/shared/src/agmrptdef.cpp Tue May 25 12:41:10 2010 +0300 @@ -2700,8 +2700,16 @@ @internalComponent */ { - delete iRRule; - delete iTimeZone; + if (iRRule) + { + delete iRRule; + iRRule = NULL; + } + if (iTimeZone) + { + delete iTimeZone; + iTimeZone = NULL; + } ClearTimeArray(iSporadicDates); ClearTimeArray(iExceptions); @@ -3885,7 +3893,14 @@ @return The start date expressed as Current System Local Time. */ { - return iOwningEntry.EntryTime(); + if (iOwningEntry.Type() == CCalEntry::ETodo) + { + return iOwningEntry.StartTime(); + } + else + { + return iOwningEntry.EntryTime(); + } } EXPORT_C void CAgnRptDef::SetUntilTime(const TAgnCalendarTime& aUntilTime)