aboutsummaryrefslogtreecommitdiff
path: root/src/time.odin
diff options
context:
space:
mode:
authorSan Jacobs2024-02-05 15:37:28 +0100
committerSan Jacobs2024-02-05 15:37:28 +0100
commitf5418b410b37eb9523f3a221d83bc87f99bb4f4f (patch)
tree70c9586f284d8a818cd8ae4be4c9b88a484bc9bc /src/time.odin
parent0c4cc3f052608b2410bf71787b14c2149e14c72b (diff)
parent0848a29feb14ae01d8cad90db61987fcf9609acd (diff)
downloadsatscalc-f5418b410b37eb9523f3a221d83bc87f99bb4f4f.tar.gz
satscalc-f5418b410b37eb9523f3a221d83bc87f99bb4f4f.tar.bz2
satscalc-f5418b410b37eb9523f3a221d83bc87f99bb4f4f.zip
Merge remote-tracking branch 'home/odin' into odin
Diffstat (limited to 'src/time.odin')
-rw-r--r--src/time.odin4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/time.odin b/src/time.odin
index 7b8127d..ac1626e 100644
--- a/src/time.odin
+++ b/src/time.odin
@@ -136,8 +136,8 @@ new_workday :: proc(previous_wrap : Moment,
j: int = 0
for each_point in splitpoints_sorted {
// If each splitpoint moment is within the workday, and is not equal to the start of the current block
- if sortable(each_point) > sortable(call) &&
- sortable(each_point) < sortable(wrap) &&
+ if sortable(each_point) > sortable(call) && // vvvvvvvvvvvvvvvvvvvvvvvv this complication is here to cover
+ sortable(each_point) < sortable(time_max(wrap, add(call, {0, 4, 0}))) && // for the 4-hour minimum day.
each_point != working_block.start {
blocks[j], working_block = timesplit(working_block, each_point)