diff --git a/SOPE/NGCards/iCalRepeatableEntityObject.m b/SOPE/NGCards/iCalRepeatableEntityObject.m index 4cc9437a3..5a7dee12c 100644 --- a/SOPE/NGCards/iCalRepeatableEntityObject.m +++ b/SOPE/NGCards/iCalRepeatableEntityObject.m @@ -330,14 +330,15 @@ lastPossibleRecurrenceStartDateUsingFirstInstanceCalendarDateRange: (NGCalendarD rRules = [[self recurrenceRules] objectEnumerator]; rule = [rRules nextObject]; - while (rule && ![rule isInfinite] & !date) + while (rule && ![rule isInfinite] && !date) { calc = [iCalRecurrenceCalculator recurrenceCalculatorForRecurrenceRule: rule - withFirstInstanceCalendarDateRange: _r]; + withFirstInstanceCalendarDateRange: _r]; rdate = [[calc lastInstanceCalendarDateRange] startDate]; - if (!date - || ([date compare: rdate] == NSOrderedAscending)) + if (!rdate) + date = [_r startDate]; + else if (!date || ([date compare: rdate] == NSOrderedAscending)) date = rdate; else rule = [rRules nextObject];