don't allow theme songs to get mixed in with children

1 files changed, 14 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 6112862af..612dc0d42 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -77,7 +77,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
 
                 // 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))
+                if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase) &&
+                    !(args.Parent is AggregateFolder) && !(args.Parent is UserRootFolder))
                 {
                     return true;
                 }
@@ -92,6 +93,18 @@ namespace MediaBrowser.Server.Implementations.Library
                     return true;
                 }
             }
+            else
+            {
+                if (args.Parent != null)
+                {
+                    var filename = args.FileInfo.Name;
+
+                    if (string.Equals(Path.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(filename))
+                    {
+                        return true;
+                    }
+                }
+            }
 
             return false;
         }