aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-05-19 15:47:29 -0400
committerGitHub <noreply@github.com>2017-05-19 15:47:29 -0400
commit35eb10d454ba8cb202f59be2ac8578175946c357 (patch)
tree2b148ae551792e40370a4113d17bafe8794e66a8 /Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
parent1f32cd94a6d83ed80dc103dccdbb95e4b9043890 (diff)
parenta0755bdffb7fe865f8bee43ef134cee655be83b8 (diff)
Merge pull request #2648 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/UserViews/DynamicImageProvider.cs')
-rw-r--r--Emby.Server.Implementations/UserViews/DynamicImageProvider.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
index b8d03db3d..b0fb954e2 100644
--- a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -159,7 +159,7 @@ namespace Emby.Server.Implementations.UserViews
return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty);
}
- protected override async Task<string> CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
+ protected override string CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
{
if (itemsWithImages.Count == 0)
{
@@ -168,7 +168,7 @@ namespace Emby.Server.Implementations.UserViews
var outputPath = Path.ChangeExtension(outputPathWithoutExtension, ".png");
- return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540).ConfigureAwait(false);
+ return CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540);
}
}
}