2
0
Эх сурвалжийг харах

Merge pull request #5383 from cvium/fix-mergeversions-overflow

do not pick a linked item as primary when merging versions

(cherry picked from commit 3741be51ec4b44f946bcdc3ad4f5232af0e2e929)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Bond-009 4 жил өмнө
parent
commit
132335a747

+ 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