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

New issue

Closed

opened 2025-12-22 07:59:29 +01:00 by backuprepo · 0 comments

backuprepo commented

2025-12-22 07:59:29 +01:00

Owner

📋 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>

backuprepo

2025-12-22 07:59:29 +01:00

closed this issue
added the
pull-request
label

backuprepo referenced this issue

2025-12-22 09:11:35 +01:00

[PR #10328] [CLOSED] Add functionality to remove empty media folders on item delete #12253

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: starred/jellyfin#10328

No description provided.

Rows
Columns