diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-03-05 21:57:22 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2021-03-06 14:30:11 -0500 |
| commit | 132335a7475de6d4453148ee2a80798da0fbd81b (patch) | |
| tree | 5064554ef172af000abef2ddd8d40e91cd07d4b1 /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 75d3d120d3cf3221b39b05a929da9917ce73487e (diff) | |
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>
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index 8c7aa7325..99654e7b0 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 |