From a7c2acc06f66efa8fc24f76b6fd5f66bf926396f Mon Sep 17 00:00:00 2001 From: Frederic Culot Date: Fri, 16 Oct 2009 15:51:33 +0000 Subject: Bugfix in the way time slices are filled. --- src/day.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/day.c b/src/day.c index f8a1532..0cd1d76 100755 --- a/src/day.c +++ b/src/day.c @@ -1,4 +1,4 @@ -/* $calcurse: day.c,v 1.51 2009/10/08 16:28:06 culot Exp $ */ +/* $calcurse: day.c,v 1.52 2009/10/16 15:51:33 culot Exp $ */ /* * Calcurse - text-based organizer @@ -559,8 +559,11 @@ day_chk_busy_slices (date_t day, int slicesno, int *slices) if (recur_item_inday (ra->start, ra->exc, ra->rpt->type, ra->rpt->freq, ra->rpt->until, date)) { - if (!fill_slices (slices, slicesno, SLICENUM (ra->start), - SLICENUM (ra->start + ra->dur))) + long start, end; + + start = get_item_time (ra->start); + end = get_item_time (ra->start + ra->dur); + if (!fill_slices (slices, slicesno, SLICENUM (start), SLICENUM (end))) { pthread_mutex_unlock (&(recur_alist_p->mutex)); return 0; @@ -572,8 +575,11 @@ day_chk_busy_slices (date_t day, int slicesno, int *slices) for (a = alist_p->root; a != 0; a = a->next) if (apoint_inday (a, date)) { - if (!fill_slices (slices, slicesno, SLICENUM (a->start), - SLICENUM (a->start + a->dur))) + long start, end; + + start = get_item_time (a->start); + end = get_item_time (a->start + a->dur); + if (!fill_slices (slices, slicesno, SLICENUM (start), SLICENUM (end))) { pthread_mutex_unlock (&(alist_p->mutex)); return 0; -- cgit v1.2.3-70-g09d2