From 77f4241b813d2f9ecc279791884f6e3c68357e2c Mon Sep 17 00:00:00 2001
From: Peter C <12292660+PeterC89@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:57:24 +0100
Subject: [PATCH] Merge branch 'bbc-release51-3' into fix/autonext-postroll

---
 packages/job-worker/src/playout/timeline/piece.ts   | 2 +-
 packages/job-worker/src/playout/timeline/rundown.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
index cea83bbcf75..bbaebb02b2e 100644
--- a/packages/job-worker/src/playout/timeline/piece.ts
+++ b/packages/job-worker/src/playout/timeline/piece.ts
@@ -108,7 +108,7 @@ export function getPieceEnableInsidePart(
 	if (partHasEndTime && partTimings.toPartPostroll) {
 		if (!pieceEnable.duration) {
 			// make sure that the control object is shortened correctly
-			pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
+			pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
 		}
 	}
 
diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts
index ec21446be02..bb32f436815 100644
--- a/packages/job-worker/src/playout/timeline/rundown.ts
+++ b/packages/job-worker/src/playout/timeline/rundown.ts
@@ -145,7 +145,8 @@ export function buildTimelineObjsForRundown(
 		) {
 			// If there is a valid autonext out of the current part, then calculate the duration
 			currentPartEnable.duration =
-				partInstancesInfo.current.partInstance.part.expectedDuration +
+				partInstancesInfo.current.calculatedTimings.toPartDelay +
+				partInstancesInfo.current.calculatedTimings.toPartPostroll // autonext should have the postroll added to it to not confuse the timeline
 				partInstancesInfo.current.calculatedTimings.toPartDelay
 
 			if (