diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 692176efca..315abd49dd 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -788,12 +788,16 @@ namespace MediaBrowser.Server.Implementations.Library .OfType<Audio>() .SelectMany(c => { - var list = c.Artists.ToList(); + var list = new List<string>(); if (!string.IsNullOrEmpty(c.AlbumArtist)) { list.Add(c.AlbumArtist); } + if (!string.IsNullOrEmpty(c.Artist)) + { + list.Add(c.Artist); + } return list; }) diff --git a/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs b/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs index d31ee87906..b0a6989e93 100644 --- a/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs +++ b/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs @@ -32,7 +32,12 @@ namespace MediaBrowser.Server.Implementations.Sorting { var audio = x as Audio; - return audio == null ? string.Empty : audio.Artists.OrderBy(i => i).FirstOrDefault() ?? string.Empty; + if (audio == null) + { + return string.Empty; + } + + return audio.Artist ?? string.Empty; } /// <summary> |