Merge branch 'master' into providermanager-cleanup

1 files changed, 5 insertions, 6 deletions

diff --git a/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
index e39280a10..1bcaccd8a 100644
--- a/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IndexNumberComparer.cs
@@ -24,14 +24,13 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
+            ArgumentNullException.ThrowIfNull(x);
+
+            ArgumentNullException.ThrowIfNull(y);
 
-            if (y == null)
+            if (!x.IndexNumber.HasValue && !y.IndexNumber.HasValue)
             {
-                throw new ArgumentNullException(nameof(y));
+                return 0;
             }
 
             if (!x.IndexNumber.HasValue)