aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordkanada <dkanada@users.noreply.github.com>2020-06-26 06:11:42 +0900
committerGitHub <noreply@github.com>2020-06-26 06:11:42 +0900
commitfc722a612e961a78f5fbdb8118c52fb469e955d1 (patch)
tree72629936557b2e815776c0f82aea888116c32e87
parent9a43dce6d052d81434295866bc720ec5767c7129 (diff)
parent9eba11379a3695eda732a481634fbac620ac0624 (diff)
Merge pull request #3445 from crobibero/invalid-image
catch skia errors when getting image dimensions
-rw-r--r--Emby.Server.Implementations/Library/LibraryManager.cs16
1 files changed, 13 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 6a20a015a..b2c9638b2 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1894,9 +1894,19 @@ namespace Emby.Server.Implementations.Library
}
}
- ImageDimensions size = _imageProcessor.GetImageDimensions(item, image);
- image.Width = size.Width;
- image.Height = size.Height;
+ try
+ {
+ ImageDimensions size = _imageProcessor.GetImageDimensions(item, image);
+ image.Width = size.Width;
+ image.Height = size.Height;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Cannnot get image dimensions for {0}", image.Path);
+ image.Width = 0;
+ image.Height = 0;
+ continue;
+ }
try
{