alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-28 21:11:55 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add error handling to work around skia crashes

Browse Source
This commit is contained in:
Luke Pulverenti
2017-11-01 15:45:10 -04:00
parent ccda4bd629
commit 5fa007d04e
6 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -304,6 +304,19 @@ namespace MediaBrowser.ServerApplication
}
}
private static string UpdatePackageFileName
{
get
{
if (Environment.Is64BitOperatingSystem)
{
return "embyserver-win-x64-{version}.zip";
}
return "embyserver-win-x86-{version}.zip";
}
}
/// <summary>
/// Runs the application.
/// </summary>
@@ -324,7 +337,7 @@ namespace MediaBrowser.ServerApplication
options,
fileSystem,
new PowerManagement(),
"emby.windows.zip",
UpdatePackageFileName,
environmentInfo,
new NullImageEncoder(),
new SystemEvents(logManager.GetLogger("SystemEvents")),
@@ -355,7 +368,7 @@ namespace MediaBrowser.ServerApplication
}
// set image encoder here
appHost.ImageProcessor.ImageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, logManager, fileSystem, options, () => appHost.HttpClient, appPaths);
appHost.ImageProcessor.ImageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, logManager, fileSystem, options, () => appHost.HttpClient, appPaths, appHost.LocalizationManager);
task = task.ContinueWith(new Action<Task>(a => appHost.RunStartupTasks()), TaskContinuationOptions.OnlyOnRanToCompletion | TaskContinuationOptions.AttachedToParent);