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

Bugfix in the way time slices are filled.

Browse Source
This commit is contained in:
Frederic Culot 2009-10-16 15:51:33 +00:00
parent abc03bb86f
commit a7c2acc06f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/day.c
View File

@ -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 * 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, if (recur_item_inday (ra->start, ra->exc, ra->rpt->type,
ra->rpt->freq, ra->rpt->until, date)) ra->rpt->freq, ra->rpt->until, date))
{ {
if (!fill_slices (slices, slicesno, SLICENUM (ra->start), long start, end;
SLICENUM (ra->start + ra->dur)))
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)); pthread_mutex_unlock (&(recur_alist_p->mutex));
return 0; 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) for (a = alist_p->root; a != 0; a = a->next)
if (apoint_inday (a, date)) if (apoint_inday (a, date))
{ {
if (!fill_slices (slices, slicesno, SLICENUM (a->start), long start, end;
SLICENUM (a->start + a->dur)))
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)); pthread_mutex_unlock (&(alist_p->mutex));
return 0; return 0;