lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2720 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-06-21 14:29:03 -04:00 committed by GitHub
commit 59d8225f45
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs
View File

@ -26,7 +26,7 @@ namespace Emby.Server.Implementations.Photos
return items; 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); return CreateSingleImage(itemsWithImages, outputPathWithoutExtension, ImageType.Primary);
} }

2
MediaBrowser.Server.Mono/ImageEncoderHelper.cs
View File

@ -31,7 +31,7 @@ namespace MediaBrowser.Server.Startup.Common
} }
catch (Exception ex) 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 try

2
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -101,7 +101,7 @@ namespace MediaBrowser.WebDashboard.Api
var parent = _fileSystem.GetDirectoryName(path); var parent = _fileSystem.GetDirectoryName(path);
return string.Equals(_basePath, parent, StringComparison.OrdinalIgnoreCase) || 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> /// <summary>

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.20.8")] [assembly: AssemblyVersion("3.2.20.9")]