From e9fb806478e974b200b54f8acff5eb09bdef4c32 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Apr 2014 23:56:20 -0400
Subject: 3.0.5231.40980

---
 MediaBrowser.Api/UserLibrary/ItemsService.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Api/UserLibrary/ItemsService.cs')

diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 1682afb10..8f3016769 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -321,7 +321,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             items = items.AsEnumerable();
 
-            if (CollapseBoxSetItems(request, parentItem))
+            if (CollapseBoxSetItems(request, parentItem, user))
             {
                 items = _collectionManager.CollapseItemsWithinBoxSets(items, user);
             }
@@ -349,7 +349,7 @@ namespace MediaBrowser.Api.UserLibrary
             };
         }
 
-        private bool CollapseBoxSetItems(GetItems request, BaseItem parentItem)
+        private bool CollapseBoxSetItems(GetItems request, BaseItem parentItem, User user)
         {
             // Could end up stuck in a loop like this
             if (parentItem is BoxSet)
@@ -361,6 +361,11 @@ namespace MediaBrowser.Api.UserLibrary
 
             if (!param.HasValue)
             {
+                if (user != null && !user.Configuration.GroupMoviesIntoBoxSets)
+                {
+                    return false;
+                }
+
                 if (!string.IsNullOrWhiteSpace(request.IncludeItemTypes) &&
                     request.IncludeItemTypes.Split(',').Contains("Movie", StringComparer.OrdinalIgnoreCase))
                 {
-- 
cgit v1.2.3