Merge branch 'develop' of https://github.com/Radarr/Radarr into develop

8 years ago · 330ae38ec2
parent a0ecb19e32 38c966c07b
commit 330ae38ec2
1 changed files with 2 additions and 2 deletions
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@ -44,14 +44,14 @@ namespace NzbDrone.Core.Queue

        private IEnumerable<Queue> MapQueue(TrackedDownload trackedDownload)
        {
-            if (trackedDownload.RemoteEpisode.Episodes != null && trackedDownload.RemoteEpisode.Episodes.Any())
+            if (trackedDownload.RemoteEpisode != null && trackedDownload.RemoteEpisode.Episodes != null && trackedDownload.RemoteEpisode.Episodes.Any())
            {
                foreach (var episode in trackedDownload.RemoteEpisode.Episodes)
                {
                    yield return MapEpisode(trackedDownload, episode);
                }
            }
-            else if (trackedDownload.RemoteMovie.Movie != null)
+            else if (trackedDownload.RemoteMovie != null && trackedDownload.RemoteMovie.Movie != null)
            {
                yield return MapMovie(trackedDownload, trackedDownload.RemoteMovie.Movie);
            }