alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixing #6269 by comparing PremiereDate when episode comparison would otherwise be equal.

Browse Source
This commit is contained in:
ankenyr
2021-09-12 15:05:37 -07:00
parent e5cbafdb6b
commit 2b5f3f294e
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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,16 @@ namespace Emby.Server.Implementations.Sorting
{
var xValue = ((x.ParentIndexNumber ?? -1) * 1000) + (x.IndexNumber ?? -1);
var yValue = ((y.ParentIndexNumber ?? -1) * 1000) + (y.IndexNumber ?? -1);
var compare_val = xValue.CompareTo(yValue);
if (compare_val == 0)
{
if (x.PremiereDate.HasValue & y.PremiereDate.HasValue)
{
compare_val = DateTime.Compare(x.PremiereDate.Value, y.PremiereDate.Value);
}
}
return xValue.CompareTo(yValue);
return compare_val;
}
/// <summary>