From 8ced20dc394b0515ba1c5f1713b7d98727e63b0d Mon Sep 17 00:00:00 2001
From: Jason Dove <jason@jasondove.me>
Date: Wed, 15 Sep 2021 20:54:32 -0500
Subject: [PATCH] dont offset collections during shuffle in order (#370)

---
 CHANGELOG.md                                              | 2 ++
 .../Scheduling/ShuffleInOrderCollectionEnumerator.cs      | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d8d5b03..f357ad293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - Enable HEAD requests for IPTV image paths since Kodi requires those
 - Properly display watermark when no other video filters (like scaling or padding) are required
 - Fix building some playouts in timezones with positive offsets (like UTC+2)
+- Fix `Shuffle In Order` so all collections/shows start from the earliest episode
+  - You may need to rebuild playouts to see this fixed behavior more quickly
 
 ## [0.0.56-alpha] - 2021-09-10
 ### Added
diff --git a/ErsatzTV.Core/Scheduling/ShuffleInOrderCollectionEnumerator.cs b/ErsatzTV.Core/Scheduling/ShuffleInOrderCollectionEnumerator.cs
index c105636bc..d7c72baf0 100644
--- a/ErsatzTV.Core/Scheduling/ShuffleInOrderCollectionEnumerator.cs
+++ b/ErsatzTV.Core/Scheduling/ShuffleInOrderCollectionEnumerator.cs
@@ -147,13 +147,7 @@ namespace ErsatzTV.Core.Scheduling
                     ordered.AddRange(larger);
                 }
 
-                int offset = random.Next(ordered.Count);
-                result.Add(
-                    new OrderedCollection
-                    {
-                        Index = 0,
-                        Items = ordered.Skip(offset).Concat(ordered.Take(offset)).ToList()
-                    });
+                result.Add(new OrderedCollection { Index = 0, Items = ordered });
             }
 
             return result;