Fix slice computation of recurring appointments

Reported-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/day.c b/src/day.c
index 131119f..219d8a6 100644
--- a/src/day.c
+++ b/src/day.c
@@ -565,10 +565,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
 	LLIST_TS_LOCK(&recur_alist_p);
 	LLIST_TS_FIND_FOREACH(&recur_alist_p, (time_t *)&t,
 			      recur_apoint_inday, i) {
-		struct apoint *rapt = LLIST_TS_GET_DATA(i);
-		long start = get_item_time(rapt->start);
+		struct recur_apoint *rapt = LLIST_TS_GET_DATA(i);
+		time_t occurrence;
+		long start;
 		long end = get_item_time(rapt->start + rapt->dur);
 
+		if (!recur_apoint_find_occurrence(rapt, t, &occurrence))
+			continue;
+		start = get_item_time(occurrence);
+
 		if (rapt->start < t)
 			start = 0;
 		if (rapt->start + rapt->dur >= t + DAYINSEC)