Merge pull request #8501 from cvium/fix_nextup

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -3541,6 +3541,12 @@ namespace Emby.Server.Implementations.Data
                 statement?.TryBind("@MinIndexNumber", query.MinIndexNumber.Value);
             }
 
+            if (query.MinParentIndexNumber.HasValue)
+            {
+                whereClauses.Add("ParentIndexNumber>=@MinParentIndexNumber");
+                statement?.TryBind("@MinParentIndexNumber", query.MinParentIndexNumber.Value);
+            }
+
             if (query.MinDateCreated.HasValue)
             {
                 whereClauses.Add("DateCreated>=@MinDateCreated");

Emby.Server.Implementations/TV/TVSeriesManager.cs

@@ -223,7 +223,9 @@ namespace Emby.Server.Implementations.TV
                     IsPlayed = rewatching,
                     IsVirtualItem = false,
                     ParentIndexNumberNotEquals = 0,
-                    DtoOptions = dtoOptions
+                    DtoOptions = dtoOptions,
+                    MinIndexNumber = lastWatchedEpisode?.IndexNumberEnd ?? lastWatchedEpisode?.IndexNumber,
+                    MinParentIndexNumber = lastWatchedEpisode?.ParentIndexNumber
                 };
 
                 Episode nextEpisode;

MediaBrowser.Controller/Entities/InternalItemsQuery.cs

@@ -205,6 +205,8 @@ namespace MediaBrowser.Controller.Entities
 
         public int? MinIndexNumber { get; set; }
 
+        public int? MinParentIndexNumber { get; set; }
+
         public int? AiredDuringSeason { get; set; }
 
         public double? MinCriticRating { get; set; }