aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-16 23:42:04 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-16 23:42:04 -0400
commitb0c484e16001bd3ba3fa2542665ef436515942a8 (patch)
tree26bfc18def24d438f72d5eba746561c7da8af9ea /MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
parent949c6a87f25df8dce2633945dd7d31e6e2172959 (diff)
allow collections named trailers
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs3
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;
}