fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "next occurrence" for multi-day appointments

Browse Source 
Better name: day for occur.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2020-05-23 21:10:26 +02:00 committed by Lukas Fleischer
parent bd238bfd7c
commit 61a743c56a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/recur.c
View File

@ -1801,18 +1801,21 @@ void recur_apoint_paste_item(struct recur_apoint *rapt, time_t date)
* buffer. Useful for test of a repeated item. * buffer. Useful for test of a repeated item.
*/ */
int recur_next_occurrence(time_t s, long d, struct rpt *r, llist_t *e, int recur_next_occurrence(time_t s, long d, struct rpt *r, llist_t *e,
time_t occur, time_t *next) time_t day, time_t *next)
{ {
int ret = 0; int ret = 0;
if (r->until && r->until <= occur) if (r->until && r->until <= day)
return ret; return ret;
while (!r->until || occur < r->until) { while (!r->until || day < r->until) {
occur = NEXTDAY(occur); day = NEXTDAY(day);
if (!check_sec(&occur)) if (!check_sec(&day))
break; break;
if (recur_item_find_occurrence(s, d, r, e, occur, next)) { if (recur_item_find_occurrence(s, d, r, e, day, next)) {
/* Multi-day appointment. */
if (*next < day)
continue;
ret = 1; ret = 1;
break; break;
} }