From 132335a7475de6d4453148ee2a80798da0fbd81b Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Fri, 5 Mar 2021 21:57:22 +0100 Subject: [PATCH] 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 --- Jellyfin.Api/Controllers/VideosController.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index 8c7aa73257..99654e7b0d 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/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