From 60dabb778728e5cb0062f3da2696eb63c12ebba8 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 22 Sep 2021 13:33:38 -0400 Subject: [PATCH] calendar: fix weekly/monthly calculators when event has no duration --- SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 3 ++- SOPE/NGCards/iCalYearlyRecurrenceCalculator.m | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index 2ec0b7aa1..29cf92724 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -135,7 +135,8 @@ [currentStartDate compare: endDate] == NSOrderedSame) { currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]]; - if ([startDate compare: currentEndDate] == NSOrderedAscending) + if ([startDate compare: currentEndDate] == NSOrderedAscending || + ([firstRange duration] == 0 && [startDate compare: currentEndDate] == NSOrderedSame)) { NGCalendarDateRange *r; diff --git a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m index 20195447e..c45d22b9d 100644 --- a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m @@ -216,7 +216,8 @@ months: 0 days: 0]; [start setTimeZone: [firStart timeZone]]; - if ([start compare: rEnd] == NSOrderedAscending) + if ([start compare: rEnd] == NSOrderedAscending || + ([firstRange duration] == 0 && [start compare: rEnd] == NSOrderedSame)) { end = [start addTimeInterval: [firstRange duration]]; r = [NGCalendarDateRange calendarDateRangeWithStartDate: start