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

Fix slice computation of recurring appointments

Browse Source 
Reported-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-04-10 09:24:15 +02:00
parent 80502f02de
commit 5ac3d43e9a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/day.c
View File

@ -565,10 +565,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
LLIST_TS_LOCK(&recur_alist_p); LLIST_TS_LOCK(&recur_alist_p);
LLIST_TS_FIND_FOREACH(&recur_alist_p, (time_t *)&t, LLIST_TS_FIND_FOREACH(&recur_alist_p, (time_t *)&t,
recur_apoint_inday, i) { recur_apoint_inday, i) {
struct apoint *rapt = LLIST_TS_GET_DATA(i); struct recur_apoint *rapt = LLIST_TS_GET_DATA(i);
long start = get_item_time(rapt->start); time_t occurrence;
long start;
long end = get_item_time(rapt->start + rapt->dur); 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) if (rapt->start < t)
start = 0; start = 0;
if (rapt->start + rapt->dur >= t + DAYINSEC) if (rapt->start + rapt->dur >= t + DAYINSEC)