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

do not pick a linked item as primary when merging versions

(cherry picked from commit 3741be51ec)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
pull/5640/head
Bond-009 4 years ago committed by Joshua M. Boniface
parent 75d3d120d3
commit 132335a747

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

Loading…
Cancel
Save