diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-05-24 14:23:06 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-05-24 14:23:06 -0400 |
| commit | 29a87adc14f0255176568ed2268d1f5b69f1fa1e (patch) | |
| tree | 46392f7cb0956f39d4455f95f862cfc496b7ff8d /MediaBrowser.ServerApplication | |
| parent | e6308f3e3cbac158ffb8342391d384c6c948d2b5 (diff) | |
| parent | 813db187422fc7597a8bf7a877d8fcba14975d03 (diff) | |
Merge pull request #1776 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/MainStartup.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |