Fixed: Null reference error when import list adds new album to existi…

…ng artist (cherry picked from commit 5e3045db86748d0ab407a6785007cb6bbd4f46a6)
Lidarr · Aug 3, 2022 · 33bb596 · 33bb596
1 parent d96775a
commit 33bb596
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs
@@ -89,14 +89,14 @@ private void WithExistingArtist()
         {
             Mocker.GetMock<IArtistService>()
                 .Setup(v => v.FindById(_importListReports.First().ArtistMusicBrainzId))
-                .Returns(new Artist { ForeignArtistId = _importListReports.First().ArtistMusicBrainzId });
+                .Returns(new Artist { Id = 1, ForeignArtistId = _importListReports.First().ArtistMusicBrainzId });
         }
 
         private void WithExistingAlbum()
         {
             Mocker.GetMock<IAlbumService>()
                 .Setup(v => v.FindById(_importListReports.First().AlbumMusicBrainzId))
-                .Returns(new Album { ForeignAlbumId = _importListReports.First().AlbumMusicBrainzId });
+                .Returns(new Album { Id = 1, ForeignAlbumId = _importListReports.First().AlbumMusicBrainzId });
         }
 
         private void WithExcludedArtist()
@@ -215,6 +215,7 @@ public void should_not_add_if_existing_album()
         public void should_add_if_existing_artist_but_new_album()
         {
             WithAlbumId();
+            WithArtistId();
             WithExistingArtist();
 
             Subject.Execute(new ImportListSyncCommand());

diff --git a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Extensions;
@@ -243,8 +244,9 @@ private void ProcessAlbumReport(ImportListDefinition importList, ImportListItemI
                     }
                 };
 
-                if (importList.ShouldMonitor == ImportListMonitorType.SpecificAlbum)
+                if (importList.ShouldMonitor == ImportListMonitorType.SpecificAlbum && toAddArtist.AddOptions != null)
                 {
+                    Debug.Assert(toAddArtist.Id == 0, "new artist added but ID is not 0");
                     toAddArtist.AddOptions.AlbumsToMonitor.Add(toAdd.ForeignAlbumId);
                 }