Merge pull request #4628 from MrTimscampi/no-next-resumable

Prevent GetUpNext from returning episodes in progress
This commit is contained in:
Claus Vium
2020-12-01 23:01:01 +01:00
committed by GitHub

View File

@@ -192,7 +192,7 @@ namespace Emby.Server.Implementations.TV
Func<Episode> getEpisode = () =>
{
return _libraryManager.GetItemList(new InternalItemsQuery(user)
var nextEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
{
AncestorWithPresentationUniqueKey = null,
SeriesPresentationUniqueKey = seriesKey,
@@ -205,6 +205,18 @@ namespace Emby.Server.Implementations.TV
MinSortName = lastWatchedEpisode?.SortName,
DtoOptions = dtoOptions
}).Cast<Episode>().FirstOrDefault();
if (nextEpisode != null)
{
var userData = _userDataManager.GetUserData(user, nextEpisode);
if (userData.PlaybackPositionTicks > 0)
{
return null;
}
}
return nextEpisode;
};
if (lastWatchedEpisode != null)