aboutsummaryrefslogtreecommitdiff
path: root/Emby.Drawing/ImageProcessor.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.Drawing/ImageProcessor.cs
parent1f32cd94a6d83ed80dc103dccdbb95e4b9043890 (diff)
parenta0755bdffb7fe865f8bee43ef134cee655be83b8 (diff)
Merge pull request #2648 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Drawing/ImageProcessor.cs')
-rw-r--r--Emby.Drawing/ImageProcessor.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 89bc96be5..92382aa47 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -670,7 +670,7 @@ namespace Emby.Drawing
var ehnancedImagePath = await GetEnhancedImageInternal(originalImagePath, item, imageType, imageIndex, enhancers, cacheGuid).ConfigureAwait(false);
// If the path changed update dateModified
- if (!ehnancedImagePath.Equals(originalImagePath, StringComparison.OrdinalIgnoreCase))
+ if (!string.Equals(ehnancedImagePath, originalImagePath, StringComparison.OrdinalIgnoreCase))
{
return GetResult(ehnancedImagePath);
}
@@ -829,7 +829,7 @@ namespace Emby.Drawing
return Path.Combine(path, filename);
}
- public async Task CreateImageCollage(ImageCollageOptions options)
+ public void CreateImageCollage(ImageCollageOptions options)
{
_logger.Info("Creating image collage and saving to {0}", options.OutputPath);