Implement various suggestions

1 files changed, 17 insertions, 9 deletions

diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 76e9f421d..b11fd48d3 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -138,15 +138,23 @@ namespace MediaBrowser.Api
             var videosWithVersions = items.Where(i => i.MediaSourceCount > 1)
                 .ToList();
 
-            var primaryVersion = videosWithVersions.FirstOrDefault() ?? items.OrderBy(i
-                    => (i.Video3DFormat.HasValue || i.VideoType != Model.Entities.VideoType.VideoFile) ? 1 : 0)
-                .ThenByDescending(i =>
-                {
-                    var stream = i.GetDefaultVideoStream();
-
-                    return stream?.Width ?? 0;
-
-                }).First();
+            var primaryVersion = videosWithVersions.FirstOrDefault();
+            if (primaryVersion == null)
+            {
+                primaryVersion = items.OrderBy(i =>
+                    {
+                        if (i.Video3DFormat.HasValue || i.VideoType != Model.Entities.VideoType.VideoFile)
+                        {
+                            return 1;
+                        }
+
+                        return 0;
+                    })
+                    .ThenByDescending(i =>
+                    {
+                        return i.GetDefaultVideoStream()?.Width ?? 0;
+                    }).First();
+            }
 
             var list = primaryVersion.LinkedAlternateVersions.ToList();