From: Sean Bright <sean.bright@gmail.com>
Date: Thu, 17 Aug 2017 17:00:09 +0000 (-0400)
Subject: res_calendar_icalendar: Properly handle recurring events
X-Git-Tag: 15.1.0-rc1~119^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07c3608c6ca8cc9d1d7ad0f5600dcfe28c2a08df;p=thirdparty%2Fasterisk.git

res_calendar_icalendar: Properly handle recurring events

When looking for recurring events, use the correct end time based on the
configured 'timeframe.'

ASTERISK-27174 #close
Reported by: Mark Thompson

Change-Id: Id90c3cfc79d561a5521d79be176683e225f2edef
---

diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 33480608aa..795a35bd94 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -333,7 +333,7 @@ static void icalendar_add_event(icalcomponent *comp, struct icaltime_span *span,
 	start_time = icaltime_current_time_with_zone(icaltimezone_get_utc_timezone());
 	end_time = icaltime_current_time_with_zone(icaltimezone_get_utc_timezone());
 	end_time.second += pvt->owner->timeframe * 60;
-	icaltime_normalize(end_time);
+	end_time = icaltime_normalize(end_time);
 
 	for (iter = icalcomponent_get_first_component(pvt->data, ICAL_VEVENT_COMPONENT);
 	     iter;