Automerge 'staging' to 'develop'.

tv2 · Jun 17, 2024 · 1ccd9fa · 1ccd9fa
2 parents 13ee2d8 + 1d15e14
commit 1ccd9fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/tv2-common/helpers/graphics/pilot/PilotGraphicGenerator.ts b/src/tv2-common/helpers/graphics/pilot/PilotGraphicGenerator.ts
@@ -20,6 +20,7 @@ import {
 	GraphicPilot,
 	HtmlPilotGraphicGenerator,
 	IsTargetingFull,
+	IsTargetingOVL,
 	IsTargetingWall,
 	PieceMetaData,
 	ShowStyleContext,
@@ -192,9 +193,15 @@ export abstract class PilotGraphicGenerator extends Graphic {
 	}
 
 	protected getPrerollDuration(): number {
-		return this.config.studio.GraphicsType === 'HTML'
-			? this.config.studio.CasparPrerollDuration
-			: this.config.studio.VizPilotGraphics.PrerollDuration
+		if (this.config.studio.GraphicsType === 'HTML') {
+			return this.config.studio.CasparPrerollDuration
+		}
+
+		if (IsTargetingOVL(this.engine)) {
+			return 0
+		}
+
+		return this.config.studio.VizPilotGraphics.PrerollDuration
 	}
 
 	protected getTv2PieceType(): Tv2PieceType {

diff --git a/src/tv2_afvd_studio/__tests__/graphics.spec.ts b/src/tv2_afvd_studio/__tests__/graphics.spec.ts
@@ -191,7 +191,7 @@ describe('Graphics', () => {
 		expect(piece.sourceLayerId).toBe(SourceLayer.PgmPilotOverlay)
 		expect(piece.outputLayerId).toBe(SharedOutputLayer.OVERLAY)
 		expect(piece.enable).toEqual({ start: 2000 })
-		expect(piece.prerollDuration).toBe(context.config.studio.VizPilotGraphics.PrerollDuration)
+		expect(piece.prerollDuration).toBe(0)
 		expect(piece.lifespan).toBe(PieceLifespan.OutOnRundownChange)
 		const content = piece.content!
 		const timeline = content.timelineObjects as TSR.TSRTimelineObj[]