Merge pull request #1510 from MediaBrowser/dev

dlna fix

1 files changed, 8 insertions, 24 deletions

diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index 9071eecb2..80b071d11 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -453,32 +453,16 @@ namespace MediaBrowser.Dlna.ContentDirectory
                 sortOrders.Add(ItemSortBy.SortName);
             }
 
-            QueryResult<BaseItem> queryResult;
-
-            if (folder is UserRootFolder)
-            {
-                var views = await _userViewManager.GetUserViews(new UserViewQuery { UserId = user.Id.ToString("N"), PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music } }, CancellationToken.None)
-                            .ConfigureAwait(false);
-
-                queryResult = new QueryResult<BaseItem>
-                {
-                    Items = views.Cast<BaseItem>().ToArray()
-                };
-                queryResult.TotalRecordCount = queryResult.Items.Length;
-            }
-            else
+            var queryResult = await folder.GetItems(new InternalItemsQuery
             {
-                queryResult = await folder.GetItems(new InternalItemsQuery
-               {
-                   Limit = limit,
-                   StartIndex = startIndex,
-                   SortBy = sortOrders.ToArray(),
-                   SortOrder = sort.SortOrder,
-                   User = user,
-                   Filter = FilterUnsupportedContent
+                Limit = limit,
+                StartIndex = startIndex,
+                SortBy = sortOrders.ToArray(),
+                SortOrder = sort.SortOrder,
+                User = user,
+                Filter = FilterUnsupportedContent
 
-               }).ConfigureAwait(false);
-            }
+            }).ConfigureAwait(false);
 
             var options = _config.GetDlnaConfiguration();