diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-05-17 11:53:13 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-05-17 11:53:13 -0400 |
| commit | 584641a6f43fee18f65dc9c8abd24b88742922ce (patch) | |
| tree | c25da5ee2b3819281cf20a0f847a0c89fef10adb /MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs | |
| parent | 1b333d124487a49f221c4f09f259a1d1891c6b44 (diff) | |
| parent | da7af24fca3b2462b971dce595cfa5e548311cce (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs index a801aef4e..1c279016d 100644 --- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs +++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs @@ -66,7 +66,8 @@ namespace MediaBrowser.Server.Implementations.Library return true; } - if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase)) + // Ignore trailer folders but allow it at the collection level + if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase) && !(args.Parent is AggregateFolder) && !(args.Parent is UserRootFolder)) { return true; } |