Fix NRE with Resolutions in Filters

ShokoAnime · Jan 10, 2024 · b8e483d · b8e483d
1 parent 46f56a5
commit b8e483d
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Shoko.Server/Filters/FilterExtensions.cs b/Shoko.Server/Filters/FilterExtensions.cs
@@ -93,11 +93,9 @@ public static Filterable ToFilterable(this SVR_AnimeSeries series, ILookup<int,
                 return subtitles;
             },
             ResolutionsDelegate = () =>
-                series.GetVideoLocals().Select(a => MediaInfoUtils.GetStandardResolution(Tuple.Create(a.Media.VideoStream.Width, a.Media.VideoStream.Height)))
-                    .ToHashSet(),
-            FilePathsDelegate = () =>
-                series.GetVideoLocals().Select(a => a.GetBestVideoLocalPlace().FilePath)
-                    .ToHashSet()
+                series.GetVideoLocals().Where(a => a.Media?.VideoStream != null).Select(a =>
+                    MediaInfoUtils.GetStandardResolution(Tuple.Create(a.Media.VideoStream.Width, a.Media.VideoStream.Height))).ToHashSet(),
+            FilePathsDelegate = () => series.GetVideoLocals().Select(a => a.GetBestVideoLocalPlace().FilePath).ToHashSet()
         };
 
         return filterable;
@@ -268,8 +266,9 @@ public static Filterable ToFilterable(this SVR_AnimeGroup group, ILookup<int, Cr
                     subtitles = subtitleLanguageNames.Aggregate((a, b) => a.Intersect(b, StringComparer.InvariantCultureIgnoreCase)).ToHashSet();
                 return subtitles;
             },
-            ResolutionsDelegate = () => series.SelectMany(a => a.GetVideoLocals()).Select(a =>
-                MediaInfoUtils.GetStandardResolution(Tuple.Create(a.Media.VideoStream.Width, a.Media.VideoStream.Height))).ToHashSet(),
+            ResolutionsDelegate =
+                () => series.SelectMany(a => a.GetVideoLocals()).Where(a => a.Media?.VideoStream != null).Select(a =>
+                    MediaInfoUtils.GetStandardResolution(Tuple.Create(a.Media.VideoStream.Width, a.Media.VideoStream.Height))).ToHashSet(),
             FilePathsDelegate = () => series.SelectMany(s => s.GetVideoLocals().Select(a => a.GetBestVideoLocalPlace().FilePath)).ToHashSet()
         };