From aaaa16ed403f77510b6c51c8a7dee8f40a91b7c9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 24 Dec 2019 14:56:49 -0500 Subject: [PATCH] fix(calendar): fix monthly computation with month day mask Fixes #4915 --- SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m index f21478b10..55b5ba8df 100644 --- a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m @@ -99,12 +99,12 @@ static BOOL NGMonthDaySet_fillWithByMonthDay (NGMonthDaySet *positiveDaySet, if (dayInMonth > 31) { ok = NO; - continue; /* error, value to large */ + continue; /* error, value too large */ } if (dayInMonth < -31) { ok = NO; - continue; /* error, value to large */ + continue; /* error, value too large */ } /* adjust negative days */ @@ -160,7 +160,7 @@ static inline unsigned iCalDoWForNSDoW (int dow) /* create range and check whether its in the requested range */ r = [[NGCalendarDateRange alloc] initWithStartDate: _startDate endDate: end]; - if ([_r containsDateRange: r]) + if ([_r doesIntersectWithDateRange: r]) [_ranges addObject: r]; [r release]; r = nil;