From 999e94dcb12b895745331050023531159b6eda7a Mon Sep 17 00:00:00 2001
From: Jason Dove <jason@jasondove.me>
Date: Wed, 10 Mar 2021 16:33:05 -0600
Subject: [PATCH] more time zone fixes

---
 ErsatzTV.Core/Scheduling/PlayoutBuilder.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
index 59239431c..2b92d8a3e 100644
--- a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
+++ b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
@@ -106,7 +106,7 @@ namespace ErsatzTV.Core.Scheduling
             PlayoutAnchor startAnchor = FindStartAnchor(playout, playoutStart, sortedScheduleItems);
 
             // start at the previously-decided time
-            DateTimeOffset currentTime = new DateTimeOffset(startAnchor.NextStart, TimeSpan.Zero).ToLocalTime();
+            DateTimeOffset currentTime = startAnchor.NextStartOffset.ToLocalTime();
             _logger.LogDebug(
                 "Starting playout {PlayoutId} for channel {ChannelNumber} - {ChannelName} at {StartTime}",
                 playout.Id,
@@ -297,7 +297,7 @@ namespace ErsatzTV.Core.Scheduling
                             {
                                 NextScheduleItem = schedule,
                                 NextScheduleItemId = schedule.Id,
-                                NextStart = start.Date + schedule.StartTime.GetValueOrDefault()
+                                NextStart = (start - start.TimeOfDay).UtcDateTime + schedule.StartTime.GetValueOrDefault()
                             };
                         case StartType.Dynamic:
                         default:
@@ -305,7 +305,7 @@ namespace ErsatzTV.Core.Scheduling
                             {
                                 NextScheduleItem = schedule,
                                 NextScheduleItemId = schedule.Id,
-                                NextStart = start.Date
+                                NextStart = (start - start.TimeOfDay).UtcDateTime
                             };
                     }
                 });