diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-19 15:47:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 15:47:29 -0400 |
| commit | 35eb10d454ba8cb202f59be2ac8578175946c357 (patch) | |
| tree | 2b148ae551792e40370a4113d17bafe8794e66a8 /MediaBrowser.Controller | |
| parent | 1f32cd94a6d83ed80dc103dccdbb95e4b9043890 (diff) | |
| parent | a0755bdffb7fe865f8bee43ef134cee655be83b8 (diff) | |
Merge pull request #2648 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Drawing/IImageProcessor.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Movies/BoxSet.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs index 7d84719ab..d98638d55 100644 --- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs @@ -105,7 +105,7 @@ namespace MediaBrowser.Controller.Drawing /// Creates the image collage. /// </summary> /// <param name="options">The options.</param> - Task CreateImageCollage(ImageCollageOptions options); + void CreateImageCollage(ImageCollageOptions options); /// <summary> /// Gets a value indicating whether [supports image collage creation]. diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs index 3f733ce03..efa85f3ae 100644 --- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs +++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs @@ -152,7 +152,7 @@ namespace MediaBrowser.Controller.Entities.Movies var currentOfficialRating = OfficialRating; // Gather all possible ratings - var ratings = GetRecursiveChildren(i => i is Movie || i is Series || i is MusicAlbum || i is Game) + var ratings = GetLinkedChildren() .Select(i => i.OfficialRating) .Where(i => !string.IsNullOrEmpty(i)) .Distinct(StringComparer.OrdinalIgnoreCase) |