mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
commit
29a87adc14
2 changed files with 4 additions and 10 deletions
|
@ -252,15 +252,7 @@ namespace MediaBrowser.Common.Implementations
|
|||
var innerProgress = new ActionableProgress<double>();
|
||||
innerProgress.RegisterAction(p => progress.Report(.8 * p + 15));
|
||||
|
||||
try
|
||||
{
|
||||
await RegisterResources(innerProgress).ConfigureAwait(false);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.ErrorException("Error in RegisterResource", ex);
|
||||
throw;
|
||||
}
|
||||
await RegisterResources(innerProgress).ConfigureAwait(false);
|
||||
|
||||
FindParts();
|
||||
progress.Report(95);
|
||||
|
|
|
@ -244,7 +244,9 @@ namespace MediaBrowser.ServerApplication
|
|||
|
||||
|
||||
var task = _appHost.Init(initProgress);
|
||||
task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
|
||||
Task.WaitAll(task);
|
||||
|
||||
task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()), TaskContinuationOptions.OnlyOnRanToCompletion | TaskContinuationOptions.AttachedToParent);
|
||||
|
||||
if (runService)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue