diff options
| author | Alex Stevens <ads@chubbymusic.co.uk> | 2016-06-01 19:06:54 +0100 |
|---|---|---|
| committer | Alex Stevens <ads@chubbymusic.co.uk> | 2016-06-01 19:06:54 +0100 |
| commit | cf1fa24e8b40ab6c1d3f8c1d2e64a4df9b5e89f4 (patch) | |
| tree | 107702357d39045760e41ab54e7fa82be018e7bd /MediaBrowser.Server.Implementations/Library/LibraryManager.cs | |
| parent | a3c3fff39f64c5966cb18616dcb444ee0135df87 (diff) | |
| parent | a8c11c0fd2c6517205e3b47a7ec63b825c1b85c8 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 56d3bd4de..032f8dbb7 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -2309,7 +2309,7 @@ namespace MediaBrowser.Server.Implementations.Library public IEnumerable<Video> FindTrailers(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService) { - var files = fileSystemChildren.Where(i => i.IsDirectory) + var files = owner.IsInMixedFolder ? new List<FileSystemMetadata>() : fileSystemChildren.Where(i => i.IsDirectory) .Where(i => string.Equals(i.Name, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase)) .SelectMany(i => _fileSystem.GetFiles(i.FullName, false)) .ToList(); |