summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederic Culot <calcurse@culot.org>2009-10-16 15:51:33 +0000
committerFrederic Culot <calcurse@culot.org>2009-10-16 15:51:33 +0000
commita7c2acc06f66efa8fc24f76b6fd5f66bf926396f (patch)
treee6e0b2b0899c3f41a39f45853d4c3afb3d5d8378 /src
parentabc03bb86f0ed57fa56c7bdeaa2aabf1360555f0 (diff)
downloadcalcurse-a7c2acc06f66efa8fc24f76b6fd5f66bf926396f.tar.gz
calcurse-a7c2acc06f66efa8fc24f76b6fd5f66bf926396f.zip
Bugfix in the way time slices are filled.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/day.c16
1 files 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;