mirror of
https://github.com/jellyfin/jellyfin
synced 2024-07-22 02:14:28 +00:00
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>
This commit is contained in:
parent
75d3d120d3
commit
132335a747
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue