diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-24 22:57:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 22:57:44 -0500 |
| commit | 2c9e056d52840dd98da27a6527fab970150c139f (patch) | |
| tree | 8af78ab36731a998807633e5b76d26f26de9faed /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | e05e002b8bb4d13eb2b80b56a0aad8903ddb701e (diff) | |
| parent | 1d7d4c573875093b97a5929fdee976cd0dcbedea (diff) | |
Merge pull request #699 from jellyfin/dev
Dev sync
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 2103e0045..dab96509c 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -644,12 +644,9 @@ namespace MediaBrowser.Controller.Entities return PostFilterAndSort(items, query, true); } - if (!(this is UserRootFolder) && !(this is AggregateFolder)) + if (!(this is UserRootFolder) && !(this is AggregateFolder) && query.ParentId == Guid.Empty) { - if (!query.ParentId.Equals(Guid.Empty)) - { - query.Parent = this; - } + query.Parent = this; } if (RequiresPostFiltering2(query)) |