fixes #506 - Song list - make columns headers clickable for sorting

1 files changed, 7 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 4ad2479e61..46dfd0ba37 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -892,7 +892,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             if (audio != null)
             {
                 dto.Album = audio.Album;
-                dto.AlbumArtist = audio.AlbumArtist;
                 dto.Artists = audio.Artists.ToArray();
 
                 var albumParent = audio.FindParent<MusicAlbum>();
@@ -916,14 +915,19 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 var songs = album.RecursiveChildren.OfType<Audio>().ToList();
 
-                dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
-
                 dto.Artists =
                     songs.SelectMany(i => i.Artists)
                          .Distinct(StringComparer.OrdinalIgnoreCase)
                          .ToArray();
             }
 
+            var hasAlbumArtist = item as IHasAlbumArtist;
+
+            if (hasAlbumArtist != null)
+            {
+                dto.AlbumArtist = hasAlbumArtist.AlbumArtist;
+            }
+
             // Add video info
             var video = item as Video;
             if (video != null)