diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index d313848fe..5534576f1 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -357,7 +357,7 @@ namespace MediaBrowser.Controller.Entities { var list = new List<Tuple<StringBuilder, bool>>(); - int thisMarker = 0, thisNumericChunk = 0; + int thisMarker = 0; while (thisMarker < s1.Length) { 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)) |