starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 05:43:54 +03:00
Code Issues 822 Packages Projects Releases 17 Wiki Activity

[PR #5383] [MERGED] do not pick a linked item as primary when merging versions #10511

New Issue
Closed
opened 2026-02-07 06:21:39 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-07 06:21:39 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/5383
Author: @cvium
Created: 3/5/2021
Status: ✅ Merged
Merged: 3/5/2021
Merged by: @Bond-009

Base: master ← Head: fix-mergeversions-overflow

📝 Commits (1)

  • 59814bd do not pick a linked item as primary when merging versions

📊 Changes

1 file changed (+1 additions, -3 deletions)

View changed files

📝 Jellyfin.Api/Controllers/VideosController.cs (+1 -3)

📄 Description

When merging two versions that are already merged (user error, but can happen), the first one would be picked and if it already has the other version as primary this line will cause a stack overflow as it goes into an infinite loop cd4641dca0/MediaBrowser.Controller/Entities/Video.cs (L174)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/5383 **Author:** [@cvium](https://github.com/cvium) **Created:** 3/5/2021 **Status:** ✅ Merged **Merged:** 3/5/2021 **Merged by:** [@Bond-009](https://github.com/Bond-009) **Base:** `master` ← **Head:** `fix-mergeversions-overflow` --- ### 📝 Commits (1) - [`59814bd`](https://github.com/jellyfin/jellyfin/commit/59814bd55e8c6c5fbd167e90403b9bd2e390c78c) do not pick a linked item as primary when merging versions ### 📊 Changes **1 file changed** (+1 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `Jellyfin.Api/Controllers/VideosController.cs` (+1 -3) </details> ### 📄 Description When merging two versions that are already merged (user error, but can happen), the first one would be picked and if it already has the other version as primary this line will cause a stack overflow as it goes into an infinite loop https://github.com/jellyfin/jellyfin/blob/cd4641dca02bae552cc7ea1942b0efbd4b791bcb/MediaBrowser.Controller/Entities/Video.cs#L174 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-07 06:21:39 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
EFjellyfin.db
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
Mirrored from GitHub Pull Request
 question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#10511
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?