diff options
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationHost.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MainStartup.cs | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 6a92533ed..a76ab9f07 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -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); diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 706e9c8ed..3a3b10188 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -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) { |