Merge branch 'master' into mediaencoding

This commit is contained in:
Bond_009
2019-12-10 23:00:59 +01:00
258 changed files with 3301 additions and 1673 deletions

View File

@@ -57,7 +57,8 @@ namespace MediaBrowser.Providers.TV.TheTVDB
{
IndexNumber = episode.IndexNumber.Value,
ParentIndexNumber = episode.ParentIndexNumber.Value,
SeriesProviderIds = series.ProviderIds
SeriesProviderIds = series.ProviderIds,
SeriesDisplayOrder = series.DisplayOrder
};
string episodeTvdbId = await _tvDbClientManager
.GetEpisodeTvdbId(episodeInfo, language, cancellationToken).ConfigureAwait(false);