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

Fix another error in the notification code

Browse Source 
In addition to checking whether a recurrent item predates the current
next appointment, we need to check that the actual occurrence of the
item predates the current appointment as well.

Fixes GitHub issue #26.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-02-11 11:50:32 +01:00
parent 2084f353e3
commit 5aa7a0962a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/recur.c
View File

@ -943,9 +943,14 @@ struct notify_app *recur_apoint_check_next(struct notify_app *app,
recur_apoint_starts_before, i) { recur_apoint_starts_before, i) {
struct recur_apoint *rapt = LLIST_TS_GET_DATA(i); struct recur_apoint *rapt = LLIST_TS_GET_DATA(i);
/*
* Check whether the recurrent appointment contains an
* occurrence which is the next item to be notified.
*/
if (recur_apoint_find_occurrence if (recur_apoint_find_occurrence
(rapt, day, &real_recur_start_time) (rapt, day, &real_recur_start_time)
&& real_recur_start_time > start) { && real_recur_start_time > start
&& real_recur_start_time < app->time) {
app->time = real_recur_start_time; app->time = real_recur_start_time;
app->txt = mem_strdup(rapt->mesg); app->txt = mem_strdup(rapt->mesg);
app->state = rapt->state; app->state = rapt->state;