Do not mark slice of end time busy

In weekly view, when computing busy slices, do not fill a slot that is
only hit by the end time of an appointment.

Suggested-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

1 files changed, 18 insertions, 4 deletions

diff --git a/src/day.c b/src/day.c
index 75719a6..0391548 100644
--- a/src/day.c
+++ b/src/day.c
@@ -582,8 +582,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
 		else
 			end = DAYINSEC - 1;
 
-		if (!fill_slices
-		    (slices, slicesno, SLICENUM(start), SLICENUM(end))) {
+		/*
+		 * If an item ends on 12:00, we do not want the 12:00 slot to
+		 * be marked busy.
+		 */
+		if (end > start)
+			end--;
+
+		if (!fill_slices(slices, slicesno, SLICENUM(start),
+					SLICENUM(end))) {
 			LLIST_TS_UNLOCK(&recur_alist_p);
 			return 0;
 		}
@@ -603,8 +610,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
 		if (apt->start + apt->dur >= t + DAYINSEC)
 			end = DAYINSEC - 1;
 
-		if (!fill_slices
-		    (slices, slicesno, SLICENUM(start), SLICENUM(end))) {
+		/*
+		 * If an item ends on 12:00, we do not want the 12:00 slot to
+		 * be marked busy.
+		 */
+		if (end > start)
+			end--;
+
+		if (!fill_slices(slices, slicesno, SLICENUM(start),
+					SLICENUM(end))) {
 			LLIST_TS_UNLOCK(&alist_p);
 			return 0;
 		}