Merge pull request #4545 from BaronGreenback/17.0RC0---Fix1

[Fix] Null Pointer in TmdbMovieProvider
4 years ago · 3442dbbaf9
parent 8ec4dda9d1 fe3e22be98
commit 3442dbbaf9
1 changed files with 5 additions and 1 deletions
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@ -129,6 +129,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                .GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
                .ConfigureAwait(false);

+            if (movieResult == null)
+            {
+                return new MetadataResult<Movie>();
+            }
+
            var movie = new Movie
            {
                Name = movieResult.Title ?? movieResult.OriginalTitle,
@ -266,7 +271,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                }
            }

-
            if (movieResult.Videos?.Results != null)
            {
                var trailers = new List<MediaUrl>();