diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2021-09-20 21:25:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 21:25:12 +0200 |
| commit | 1b0e6b871b65a20a550dde388873a8bf44eb8096 (patch) | |
| tree | 289be0f50c1a99529c5a2fb2c0815ba286d1a2ac /Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs | |
| parent | eb0f7e071b4a1fcf4a34fbc07e072e52f39b4b04 (diff) | |
| parent | 27e32083a1052bf323f92ace216053b7b2b7c9c8 (diff) | |
Merge pull request #6571 from Dixin/master
Fix extra folder name and type mapping.
Diffstat (limited to 'Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs index c7d113963..bc5b4499f 100644 --- a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs +++ b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs @@ -54,7 +54,7 @@ namespace Emby.Server.Implementations.Library if (parent != null) { // Ignore trailer folders but allow it at the collection level - if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase) + if (string.Equals(filename, BaseItem.TrailersFolderName, StringComparison.OrdinalIgnoreCase) && !(parent is AggregateFolder) && !(parent is UserRootFolder)) { @@ -77,7 +77,7 @@ namespace Emby.Server.Implementations.Library if (parent != null) { // Don't resolve these into audio files - if (Path.GetFileNameWithoutExtension(filename.AsSpan()).Equals(BaseItem.ThemeSongFilename, StringComparison.Ordinal) + if (Path.GetFileNameWithoutExtension(filename.AsSpan()).Equals(BaseItem.ThemeSongFileName, StringComparison.Ordinal) && _libraryManager.IsAudioFile(filename)) { return true; |