starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-21 16:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

update image saver

Browse Source
This commit is contained in:
Luke Pulverenti
2017-02-04 16:22:55 -05:00
parent 9c86c8fe2b
commit ac3ec6d185
10 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@@ -788,7 +788,7 @@ namespace MediaBrowser.Controller.Entities
query.IsVirtualUnaired,
query.IsUnaired);
if (collapseBoxSetItems)
if (collapseBoxSetItems && user != null)
{
items = CollapseBoxSetItemsIfNeeded(items, query, queryParent, user, configurationManager);
}
@@ -1119,13 +1119,11 @@ namespace MediaBrowser.Controller.Entities
InternalItemsQuery query,
ILibraryManager libraryManager, bool enableSorting)
{
var user = query.User;
items = items.DistinctBy(i => i.GetPresentationUniqueKey(), StringComparer.OrdinalIgnoreCase);
if (query.SortBy.Length > 0)
{
items = libraryManager.Sort(items, user, query.SortBy, query.SortOrder);
items = libraryManager.Sort(items, query.User, query.SortBy, query.SortOrder);
}
var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();