From a6d509c871ea7dc3c4561423d7223ceaaa70c57f Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 16 Aug 2020 00:33:49 -0400 Subject: [PATCH] Fixed: Possible Null Ref in Old API --- src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs | 13 +++---------- src/NzbDrone.Api/Wanted/MovieCutoffModule.cs | 2 +- src/NzbDrone.Api/Wanted/MovieMissingModule.cs | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs b/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs index 820518306..b5b473cc9 100644 --- a/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs +++ b/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs @@ -42,19 +42,12 @@ protected MovieModuleWithSignalR(IMovieService movieService, protected MovieResource GetMovie(int id) { var movie = _movieService.GetMovie(id); - var resource = MapToResource(movie, true); - return resource; + return MapToResource(movie); } - protected MovieResource MapToResource(Core.Movies.Movie episode, bool includeSeries) + protected MovieResource MapToResource(Movie movie) { - var resource = episode.ToResource(); - - if (includeSeries) - { - var series = episode ?? _movieService.GetMovie(episode.Id); - resource = series.ToResource(); - } + var resource = movie.ToResource(); return resource; } diff --git a/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs b/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs index c96b12f1a..1598aa180 100644 --- a/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs +++ b/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs @@ -37,7 +37,7 @@ private PagingResource GetCutoffUnmetMovies(PagingResource v.Monitored == true); } - var resource = ApplyToPage(_movieCutoffService.MoviesWhereCutoffUnmet, pagingSpec, v => MapToResource(v, true)); + var resource = ApplyToPage(_movieCutoffService.MoviesWhereCutoffUnmet, pagingSpec, v => MapToResource(v)); return resource; } diff --git a/src/NzbDrone.Api/Wanted/MovieMissingModule.cs b/src/NzbDrone.Api/Wanted/MovieMissingModule.cs index 3fe30f1ac..a49314128 100644 --- a/src/NzbDrone.Api/Wanted/MovieMissingModule.cs +++ b/src/NzbDrone.Api/Wanted/MovieMissingModule.cs @@ -32,7 +32,7 @@ private PagingResource GetMissingMovies(PagingResource v.Monitored == true); } - var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v, true)); + var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v)); return resource; }