From f1fa4251a88d4f45492d5dae4d6df960d64a29a7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 21 Jun 2017 14:21:12 -0400 Subject: [PATCH 1/2] update logging --- Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs | 2 +- MediaBrowser.Server.Mono/ImageEncoderHelper.cs | 2 +- MediaBrowser.WebDashboard/Api/PackageCreator.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs b/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs index 0744fc0d9d..17f9b491dc 100644 --- a/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs +++ b/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs @@ -26,7 +26,7 @@ namespace Emby.Server.Implementations.Photos return items; } - protected string CreateImage(IHasImages item, List itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex) + protected override string CreateImage(IHasImages item, List itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex) { return CreateSingleImage(itemsWithImages, outputPathWithoutExtension, ImageType.Primary); } diff --git a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs index a74a18f37a..12df23c1e0 100644 --- a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs +++ b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs @@ -31,7 +31,7 @@ namespace MediaBrowser.Server.Startup.Common } catch (Exception ex) { - logger.Error("Error loading Skia: {0}. Will revert to ImageMagick.", ex.Message); + logger.Info("Error loading Skia: {0}. Will revert to ImageMagick.", ex.Message); } try diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index ee911f0e98..7d825875d6 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -101,7 +101,7 @@ namespace MediaBrowser.WebDashboard.Api var parent = _fileSystem.GetDirectoryName(path); return string.Equals(_basePath, parent, StringComparison.OrdinalIgnoreCase) || - string.Equals(Path.Combine(_basePath, "voice"), parent, StringComparison.OrdinalIgnoreCase); + string.Equals(Path.Combine(_basePath, "offline"), parent, StringComparison.OrdinalIgnoreCase); } /// From 295c01a62ff1e8c9bb7e46e81df5d6d8007558b2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 21 Jun 2017 14:28:40 -0400 Subject: [PATCH 2/2] 3.2.20.9 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 240dcaff19..0cfd063cf2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.8")] +[assembly: AssemblyVersion("3.2.20.9")]