diff options
| author | artiume <siderite@gmail.com> | 2020-02-23 10:57:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 10:57:52 -0500 |
| commit | 697aee5b0c7e485e69c821406dbc5547f5c78833 (patch) | |
| tree | b52ac1485deb9cfb13ea71e7e3abb845440aa7a1 /Jellyfin.Server/Program.cs | |
| parent | 4becaf83dd60bc0e225e8320d18d7aae88d4057b (diff) | |
| parent | 0a55eb9106f21256c78b963e1751a0de9fb56207 (diff) | |
Merge pull request #21 from jellyfin/master
nightly
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 1b4280d82..1dd598236 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -168,7 +168,7 @@ namespace Jellyfin.Server _loggerFactory, options, new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths), - new NullImageEncoder(), + GetImageEncoder(appPaths), new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()), appConfig); try @@ -192,8 +192,6 @@ namespace Jellyfin.Server throw; } - appHost.ImageProcessor.ImageEncoder = GetImageEncoder(appPaths, appHost.LocalizationManager); - await appHost.RunStartupTasksAsync().ConfigureAwait(false); stopWatch.Stop(); @@ -491,9 +489,7 @@ namespace Jellyfin.Server } } - private static IImageEncoder GetImageEncoder( - IApplicationPaths appPaths, - ILocalizationManager localizationManager) + private static IImageEncoder GetImageEncoder(IApplicationPaths appPaths) { try { @@ -502,8 +498,7 @@ namespace Jellyfin.Server return new SkiaEncoder( _loggerFactory.CreateLogger<SkiaEncoder>(), - appPaths, - localizationManager); + appPaths); } catch (Exception ex) { |