Merge remote-tracking branch 'jellyfinorigin/master' into feature/10.10/DetachedMigration

1 files changed, 7 insertions, 2 deletions

diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index d11b03a2e2..f8ce473da3 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -117,7 +117,7 @@ namespace Emby.Server.Implementations.TV
                 .ToList();
 
             // Avoid implicitly captured closure
-            var episodes = GetNextUpEpisodes(request, user, items, options);
+            var episodes = GetNextUpEpisodes(request, user, items.Distinct().ToArray(), options);
 
             return GetResult(episodes, request);
         }
@@ -262,7 +262,7 @@ namespace Emby.Server.Implementations.TV
                 {
                     var userData = _userDataManager.GetUserData(user, nextEpisode);
 
-                    if (userData.PlaybackPositionTicks > 0)
+                    if (userData?.PlaybackPositionTicks > 0)
                     {
                         return null;
                     }
@@ -275,6 +275,11 @@ namespace Emby.Server.Implementations.TV
             {
                 var userData = _userDataManager.GetUserData(user, lastWatchedEpisode);
 
+                if (userData is null)
+                {
+                    return (DateTime.MinValue, GetEpisode);
+                }
+
                 var lastWatchedDate = userData.LastPlayedDate ?? DateTime.MinValue.AddDays(1);
 
                 return (lastWatchedDate, GetEpisode);