diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-21 14:29:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 14:29:03 -0400 |
| commit | 59d8225f4599df86ff0e7354165fd2a12cd15205 (patch) | |
| tree | 295581fedba3336fe07a2b6dec283659f577b6bb | |
| parent | 16423b761cd67a223c9c68edb6b8fc178283eedb (diff) | |
| parent | 295c01a62ff1e8c9bb7e46e81df5d6d8007558b2 (diff) | |
Merge pull request #2720 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/ImageEncoderHelper.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs b/Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs index 0744fc0d9..17f9b491d 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<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex) + protected override string CreateImage(IHasImages item, List<BaseItem> 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 a74a18f37..12df23c1e 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 ee911f0e9..7d825875d 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); } /// <summary> diff --git a/SharedVersion.cs b/SharedVersion.cs index 240dcaff1..0cfd063cf 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")] |