Fixed: Minor Cleanup

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>

src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs

@@ -33,10 +33,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
             var queue = _queueService.GetQueue();
-            var matchingAlbum = queue.Where(q => q.RemoteAlbum != null &&
+            var matchingAlbum = queue.Where(q => q.RemoteAlbum?.Artist != null &&
-                                       q.RemoteAlbum.Artist != null &&
+                                                 q.RemoteAlbum.Artist.Id == subject.Artist.Id &&
-                                       q.RemoteAlbum.Artist.Id == subject.Artist.Id &&
+                                                 q.RemoteAlbum.Albums.Select(e => e.Id).Intersect(subject.Albums.Select(e => e.Id)).Any())
-                                       q.RemoteAlbum.Albums.Select(e => e.Id).Intersect(subject.Albums.Select(e => e.Id)).Any())
                            .ToList();
 
 

src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs

@@ -54,6 +54,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                 if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
                 {
                     var recent = mostRecent.Date.After(DateTime.UtcNow.AddHours(-12));
+
+                    if (!recent && cdhEnabled)
+                    {
+                        continue;
+                    }
+
                     // The artist will be the same as the one in history since it's the same album.
                     // Instead of fetching the artist from the DB reuse the known artist.
                     var preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, mostRecent.SourceTitle);
@@ -72,11 +78,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                         subject.ParsedAlbumInfo.Quality,
                         subject.PreferredWordScore);
 
-                    if (!recent && cdhEnabled)
-                    {
-                        continue;
-                    }
-
                     if (!cutoffUnmet)
                     {
                         if (recent)