From ecd151a0a8be670def75179ef260f1bbf204e320 Mon Sep 17 00:00:00 2001
From: arc-alex <ac@omnivox.dk>
Date: Tue, 28 Nov 2023 15:27:19 +0100
Subject: [PATCH] use expectedFinish

---
 apps/server/src/services/TimerService.ts | 2 +-
 apps/server/src/services/timerUtils.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/services/TimerService.ts b/apps/server/src/services/TimerService.ts
index 47d096bb0..2d5a717ac 100644
--- a/apps/server/src/services/TimerService.ts
+++ b/apps/server/src/services/TimerService.ts
@@ -404,7 +404,7 @@ export class TimerService {
     let shouldNotify = false;
     if (this.playback === Playback.Roll) {
       shouldNotify = true;
-      if (skipedOutOfEvent(previousTime, this.timer.clock, this.timer.startedAt, this.timer.finishedAt)) {
+      if (skipedOutOfEvent(previousTime, this.timer.clock, this.timer.startedAt, this.timer.expectedFinish)) {
         PlaybackService.roll();
       } else {
         this.updateRoll();
diff --git a/apps/server/src/services/timerUtils.ts b/apps/server/src/services/timerUtils.ts
index 5b402650c..cd9ce5392 100644
--- a/apps/server/src/services/timerUtils.ts
+++ b/apps/server/src/services/timerUtils.ts
@@ -66,11 +66,11 @@ export function getCurrent(
   return startedAt + duration + addedTime + pausedTime - clock;
 }
 
-export function skipedOutOfEvent(previousTime: number, clock: number, startedAt: number, finishAt): boolean {
+export function skipedOutOfEvent(previousTime: number, clock: number, startedAt: number, expectedFinish): boolean {
   const skipTime = previousTime - clock;
   const hasSkipped = Math.abs(skipTime) > config.timeSkipLimit;
   if (hasSkipped) {
-    if (clock > finishAt || clock < startedAt) {
+    if (clock > expectedFinish || clock < startedAt) {
       return true;
     }
     // otherwise we just skipped within the event