aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-02 08:43:53 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-02 08:43:53 -0400
commite9aa4e0dedeb1fef5ec9ce39b8fb2cd1c75b0e51 (patch)
tree4a8d67ca6ca1efa61229b33f4757178bce6a9211
parentb71be7492d6f06310ad866041dd6375b3e7f8773 (diff)
don't allow nested music artists
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 8a7f596af..60a262fab 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -33,6 +33,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
if (args.Parent == null) return null;
if (args.Parent.IsRoot) return null;
+ // Don't allow nested artists
+ if (args.Parent is MusicArtist)
+ {
+ return null;
+ }
+
// If we contain an album assume we are an artist folder
return args.FileSystemChildren.Where(i => i.Attributes.HasFlag(FileAttributes.Directory)).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName)) ? new MusicArtist() : null;
}