From 640fcf3eaf6600fed9dce4819c93b27fefabfcc8 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Tue, 17 Jan 2017 23:57:04 +0100 Subject: [PATCH] Remove series references --- .../DownloadDecisionComparer.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs index 67117ca85..aba427cbf 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs @@ -68,22 +68,25 @@ namespace NzbDrone.Core.DecisionEngine private int CompareProtocol(DownloadDecision x, DownloadDecision y) { - var result = CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => - { - var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Series.Tags); - var downloadProtocol = remoteEpisode.Release.DownloadProtocol; - return downloadProtocol == delayProfile.PreferredProtocol; - }); if (x.IsForMovie) { - result = CompareBy(x.RemoteMovie, y.RemoteMovie, remoteEpisode => + return CompareBy(x.RemoteMovie, y.RemoteMovie, remoteEpisode => { var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Movie.Tags); var downloadProtocol = remoteEpisode.Release.DownloadProtocol; return downloadProtocol == delayProfile.PreferredProtocol; }); } + + var result = CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode => + { + var delayProfile = _delayProfileService.BestForTags(remoteEpisode.Series.Tags); + var downloadProtocol = remoteEpisode.Release.DownloadProtocol; + return downloadProtocol == delayProfile.PreferredProtocol; + }); + + return result; } @@ -125,8 +128,8 @@ namespace NzbDrone.Core.DecisionEngine private int CompareAgeIfUsenet(DownloadDecision x, DownloadDecision y) { - if (x.RemoteEpisode.Release.DownloadProtocol != DownloadProtocol.Usenet || - y.RemoteEpisode.Release.DownloadProtocol != DownloadProtocol.Usenet) + if (x.RemoteMovie.Release.DownloadProtocol != DownloadProtocol.Usenet || + y.RemoteMovie.Release.DownloadProtocol != DownloadProtocol.Usenet) { return 0; }