Przeglądaj źródła

do not pick a linked item as primary when merging versions

cvium 4 lat temu
rodzic
commit
59814bd55e
1 zmienionych plików z 1 dodań i 3 usunięć
  1. 1 3
      Jellyfin.Api/Controllers/VideosController.cs

+ 1 - 3
Jellyfin.Api/Controllers/VideosController.cs

@@ -217,9 +217,7 @@ namespace Jellyfin.Api.Controllers
                 return BadRequest("Please supply at least two videos to merge.");
             }
 
-            var videosWithVersions = items.Where(i => i.MediaSourceCount > 1).ToList();
-
-            var primaryVersion = videosWithVersions.FirstOrDefault();
+            var primaryVersion = items.FirstOrDefault(i => i.MediaSourceCount > 1 && string.IsNullOrEmpty(i.PrimaryVersionId));
             if (primaryVersion == null)
             {
                 primaryVersion = items