diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index 0af7df222..6c3fcbac1 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -85,7 +85,7 @@ namespace MediaBrowser.Api.LiveTv { var result = GetChannelsAsync(request).Result; - return ToOptimizedResult(result); + return ToOptimizedResult(result.ToList()); } private async Task> GetChannelsAsync(GetChannels request) @@ -105,7 +105,7 @@ namespace MediaBrowser.Api.LiveTv { var result = GetRecordingsAsync(request).Result; - return ToOptimizedResult(result); + return ToOptimizedResult(result.ToList()); } private async Task> GetRecordingsAsync(GetRecordings request) diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs index fd980abc8..bcbbe3b9e 100644 --- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs +++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs @@ -53,7 +53,6 @@ namespace MediaBrowser.Server.Implementations.Drawing private readonly IJsonSerializer _jsonSerializer; private readonly IServerApplicationPaths _appPaths; - private readonly string _imageSizeCachePath; private readonly string _croppedWhitespaceImageCachePath; private readonly string _enhancedImageCachePath; private readonly string _resizedImageCachePath; @@ -65,7 +64,6 @@ namespace MediaBrowser.Server.Implementations.Drawing _jsonSerializer = jsonSerializer; _appPaths = appPaths; - _imageSizeCachePath = Path.Combine(appPaths.ImageCachePath, "image-sizes"); _croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images"); _enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images"); _resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images"); @@ -78,11 +76,17 @@ namespace MediaBrowser.Server.Implementations.Drawing { sizeDictionary = jsonSerializer.DeserializeFromFile>(ImageSizeFile); } - catch (IOException) + catch (FileNotFoundException) { // No biggie sizeDictionary = new Dictionary(); } + catch (Exception ex) + { + logger.ErrorException("Error parsing image size cache file", ex); + + sizeDictionary = new Dictionary(); + } _cachedImagedSizes = new ConcurrentDictionary(sizeDictionary); }