From dc3578660f6e98052146aa3cc2a215821e6b002b Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Sun, 5 May 2024 09:08:08 -0500
Subject: [PATCH] fix flood playout item watermark (#1705)

---
 .../GetPlayoutItemProcessByChannelNumberHandler.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs b/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs
index 213f2dd3..de9a3d7a 100644
--- a/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs
+++ b/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs
@@ -83,7 +83,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
             .Include(i => i.Playout)
             .ThenInclude(p => p.Deco)
             .ThenInclude(d => d.Watermark)
-            
+
             // get playout templates (and deco templates/decos)
             .Include(i => i.Playout)
             .ThenInclude(p => p.Templates)
@@ -232,7 +232,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                     watermarkId => dbContext.ChannelWatermarks
                         .SelectOneAsync(w => w.Id, w => w.Id == watermarkId));
 
-            Option<ChannelWatermark> playoutItemWatermark = Option<ChannelWatermark>.None;
+            Option<ChannelWatermark> playoutItemWatermark = Optional(playoutItemWithPath.PlayoutItem.Watermark);
             bool disableWatermarks = playoutItemWithPath.PlayoutItem.DisableWatermarks;
             WatermarkResult watermarkResult = GetPlayoutItemWatermark(playoutItemWithPath.PlayoutItem.Playout, now);
             switch (watermarkResult)
@@ -459,7 +459,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
         DateTimeOffset now)
     {
         Option<FillerPreset> maybeFallback = Option<FillerPreset>.None;
-        
+
         DeadAirFallbackResult decoDeadAirFallback = GetDecoDeadAirFallback(playout, now);
         switch (decoDeadAirFallback)
         {
@@ -491,7 +491,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                 }
                 break;
         }
-        
+
 
         foreach (FillerPreset fallbackPreset in maybeFallback)
         {
@@ -756,10 +756,10 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
         {
             return new DecoEntries(Option<Deco>.None, Option<Deco>.None);
         }
-        
+
         Option<Deco> maybePlayoutDeco = Optional(playout.Deco);
         Option<Deco> maybeTemplateDeco = Option<Deco>.None;
-        
+
         Option<PlayoutTemplate> maybeActiveTemplate =
             PlayoutTemplateSelector.GetPlayoutTemplateFor(playout.Templates, now);
 
@@ -773,7 +773,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                 maybeTemplateDeco = Optional(item.Deco);
             }
         }
-        
+
         return new DecoEntries(maybeTemplateDeco, maybePlayoutDeco);
     }