michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1776 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-05-24 14:23:06 -04:00
commit 29a87adc14
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
View File

@ -252,15 +252,7 @@ namespace MediaBrowser.Common.Implementations
var innerProgress = new ActionableProgress<double>(); var innerProgress = new ActionableProgress<double>();
innerProgress.RegisterAction(p => progress.Report(.8 * p + 15)); innerProgress.RegisterAction(p => progress.Report(.8 * p + 15));
try
{
await RegisterResources(innerProgress).ConfigureAwait(false); await RegisterResources(innerProgress).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.ErrorException("Error in RegisterResource", ex);
throw;
}
FindParts(); FindParts();
progress.Report(95); progress.Report(95);

4
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -244,7 +244,9 @@ namespace MediaBrowser.ServerApplication
var task = _appHost.Init(initProgress); 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) if (runService)
{ {