diff options
| author | LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com> | 2019-03-16 00:25:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 00:25:16 -0700 |
| commit | 2d0844b5dbf08869896c5479c10675c4fe7fa988 (patch) | |
| tree | dea28b14d2b1733edf1a90a46f4163f6123616fe /Emby.Drawing/ImageProcessor.cs | |
| parent | 221389089cc9ca4b69907d6bf3e9d38bf94393ea (diff) | |
| parent | 59031ee3b8b2ac8298c41f9171b658e3f15e17bc (diff) | |
Merge pull request #1 from jellyfin/master
merging myself to latest
Diffstat (limited to 'Emby.Drawing/ImageProcessor.cs')
| -rw-r--r-- | Emby.Drawing/ImageProcessor.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs index faaeb5af8..6d209d8d0 100644 --- a/Emby.Drawing/ImageProcessor.cs +++ b/Emby.Drawing/ImageProcessor.cs @@ -180,6 +180,12 @@ namespace Emby.Drawing var supportedImageInfo = await GetSupportedImage(originalImagePath, dateModified).ConfigureAwait(false); originalImagePath = supportedImageInfo.path; + + if (!File.Exists(originalImagePath)) + { + return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified); + } + dateModified = supportedImageInfo.dateModified; bool requiresTransparency = TransparentImageTypes.Contains(Path.GetExtension(originalImagePath)); @@ -265,8 +271,6 @@ namespace Emby.Drawing { // If it fails for whatever reason, return the original image _logger.LogError(ex, "Error encoding image"); - - // Just spit out the original file if all the options are default return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified); } finally |
