Merge pull request #16490 from theguymadmax/fix-nested-boxsets-query

Fix BoxSet parentId being ignored in item queries

1 files changed, 7 insertions, 4 deletions

diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 091a0c8c73..39760556a6 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -11,6 +11,7 @@ using Jellyfin.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
@@ -270,15 +271,17 @@ public class ItemsController : BaseJellyfinApiController
         var dtoOptions = new DtoOptions { Fields = fields }
             .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
 
+        var item = _libraryManager.GetParentItem(parentId, userId);
+        QueryResult<BaseItem> result;
+
         if (includeItemTypes.Length == 1
-            && includeItemTypes[0] == BaseItemKind.BoxSet)
+            && includeItemTypes[0] == BaseItemKind.BoxSet
+            && item is not BoxSet)
         {
             parentId = null;
+            item = _libraryManager.GetUserRootFolder();
         }
 
-        var item = _libraryManager.GetParentItem(parentId, userId);
-        QueryResult<BaseItem> result;
-
         if (item is not Folder folder)
         {
             folder = _libraryManager.GetUserRootFolder();