diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-02 19:53:30 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-02 19:53:30 -0400 |
| commit | fc4876cfd2b921de06792bd1c9839bb54991f383 (patch) | |
| tree | 6398e75fb2e9bd1ae323c86477399dda676b97cf /MediaBrowser.Controller/Entities/UserRootFolder.cs | |
| parent | da82c0c3f731f70dc416425682cfbeaed9b98b75 (diff) | |
| parent | 58ecbf3ca8f9b77ed1f3b121a6528a1095570f55 (diff) | |
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Controller/Entities/UserRootFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserRootFolder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs index 104408860..8ce39c697 100644 --- a/MediaBrowser.Controller/Entities/UserRootFolder.cs +++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Controller.Library; namespace MediaBrowser.Controller.Entities { @@ -17,7 +18,7 @@ namespace MediaBrowser.Controller.Entities /// </summary> public class UserRootFolder : Folder { - public override async Task<QueryResult<BaseItem>> GetItems(InternalItemsQuery query) + protected override async Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query) { if (query.Recursive) { |