Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 39 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index adaec9fdcf..cbf35f8700 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -96,5 +96,17 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             return string.Equals(Artist, name, StringComparison.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase);
         }
+
+        public override string DisplayMediaType
+        {
+            get
+            {
+                return "Song";
+            }
+            set
+            {
+                base.DisplayMediaType = value;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 0366af8c76..95b047e7d1 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -147,7 +147,33 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// <returns><c>true</c> if the specified artist has artist; otherwise, <c>false</c>.</returns>
         public bool HasArtist(string artist)
         {
-            return Children.OfType<Audio>().Any(i => i.HasArtist(artist));
+            return RecursiveChildren.OfType<Audio>().Any(i => i.HasArtist(artist));
+        }
+
+        public override string Name
+        {
+            get
+            {
+                var song = RecursiveChildren.OfType<Audio>().FirstOrDefault(i => !string.IsNullOrEmpty(i.Album));
+
+                return song == null ? base.Name : song.Album;
+            }
+            set
+            {
+                base.Name = value;
+            }
+        }
+
+        public override string DisplayMediaType
+        {
+            get
+            {
+                return "Album";
+            }
+            set
+            {
+                base.DisplayMediaType = value;
+            }
         }
     }
 }