From 7d05c875f3865d0baa98a9a3dcfd05842354a764 Mon Sep 17 00:00:00 2001
From: theguymadmax <171496228+theguymadmax@users.noreply.github.com>
Date: Mon, 17 Nov 2025 14:08:50 -0500
Subject: [PATCH] Backport pull request #15380 from jellyfin/release-10.11.z

Fix item count display for collapsed items

Original-merge: 8f71922734d42591b3236f4c52d9692f1b191da2

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Controller/Entities/Folder.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index ed2d201e32..151b957fe9 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -729,9 +729,7 @@ namespace MediaBrowser.Controller.Entities
                     query.StartIndex = startIndex;
                 }
 
-                var result = PostFilterAndSort(items, query);
-                result.TotalRecordCount = totalCount;
-                return result;
+                return PostFilterAndSort(items, query);
             }
 
             if (this is not UserRootFolder
@@ -1001,9 +999,7 @@ namespace MediaBrowser.Controller.Entities
                 items = GetChildren(user, true, out totalItemCount, childQuery).Where(filter);
             }
 
-            var result = PostFilterAndSort(items, query);
-            result.TotalRecordCount = totalItemCount;
-            return result;
+            return PostFilterAndSort(items, query);
         }
 
         protected QueryResult<BaseItem> PostFilterAndSort(IEnumerable<BaseItem> items, InternalItemsQuery query)
@@ -1039,7 +1035,15 @@ namespace MediaBrowser.Controller.Entities
                 items = UserViewBuilder.FilterForAdjacency(items.ToList(), query.AdjacentTo.Value);
             }
 
-            return UserViewBuilder.SortAndPage(items, null, query, LibraryManager);
+            var filteredItems = items as IReadOnlyList<BaseItem> ?? items.ToList();
+            var result = UserViewBuilder.SortAndPage(filteredItems, null, query, LibraryManager);
+
+            if (query.EnableTotalRecordCount)
+            {
+                result.TotalRecordCount = filteredItems.Count;
+            }
+
+            return result;
         }
 
         private static IEnumerable<BaseItem> CollapseBoxSetItemsIfNeeded(