From de224bcce547f3d1369dd0505d000fedaf0bfaec Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 1 Oct 2018 21:33:45 -0400 Subject: [PATCH] Fixed: Avoid NullRef from ArtistStats when linking albumStats --- .../Albums/AlbumModuleWithSignalR.cs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs b/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs index 10b500f93..7ecd7ae8a 100644 --- a/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs @@ -73,10 +73,7 @@ namespace Lidarr.Api.V1.Albums { var artist = album.Artist ?? _artistService.GetArtist(album.ArtistId); - if (includeArtist) - { - resource.Artist = artist.ToResource(); - } + resource.Artist = artist.ToResource(); } FetchAndLinkAlbumStatistics(resource); @@ -99,14 +96,10 @@ namespace Lidarr.Api.V1.Albums var artist = album.Artist ?? artistDict.GetValueOrDefault(albums[i].ArtistId) ?? _artistService.GetArtist(albums[i].ArtistId); artistDict[artist.Id] = artist; - if (includeArtist) - { - resource.Artist = artist.ToResource(); - } + resource.Artist = artist.ToResource(); } } - - var artistList = albums.DistinctBy(a => a.ArtistId).ToList(); + var artistStats = _artistStatisticsService.ArtistStatistics(); LinkArtistStatistics(result, artistStats); @@ -129,7 +122,7 @@ namespace Lidarr.Api.V1.Albums private void LinkArtistStatistics(AlbumResource resource, ArtistStatistics artistStatistics) { - if (artistStatistics.AlbumStatistics != null) + if (artistStatistics?.AlbumStatistics != null) { var dictAlbumStats = artistStatistics.AlbumStatistics.ToDictionary(v => v.AlbumId);