alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-28 22:18:06 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #6553 from ankenyr/master

Browse Source
This commit is contained in:
Claus Vium
2021-09-21 08:09:41 +02:00
committed by GitHub
parent 9bb222b408 d557a5371e
commit c38d19682c
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Emby.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
View File

@@ -28,16 +28,6 @@ namespace Emby.Server.Implementations.Sorting
throw new ArgumentNullException(nameof(y));
}
if (x.PremiereDate.HasValue && y.PremiereDate.HasValue)
{
var val = DateTime.Compare(x.PremiereDate.Value, y.PremiereDate.Value);
if (val != 0)
{
// return val;
}
}
var episode1 = x as Episode;
var episode2 = y as Episode;
@@ -156,8 +146,14 @@ namespace Emby.Server.Implementations.Sorting
{
var xValue = ((x.ParentIndexNumber ?? -1) * 1000) + (x.IndexNumber ?? -1);
var yValue = ((y.ParentIndexNumber ?? -1) * 1000) + (y.IndexNumber ?? -1);
var comparisonResult = xValue.CompareTo(yValue);
// If equal, compare premiere dates
if (comparisonResult == 0 && x.PremiereDate.HasValue && y.PremiereDate.HasValue)
{
comparisonResult = DateTime.Compare(x.PremiereDate.Value, y.PremiereDate.Value);
}
return xValue.CompareTo(yValue);
return comparisonResult;
}
/// <summary>