aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-24 14:17:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-24 14:30:55 -0400
commit6647ff335fc8cf92aad5a5031280b7f92d2ffd50 (patch)
treef8a66ba77bcc903812d3db77c0e8d580686e3707
parent3b4975323ca3dcc5659a2e1ac7077add48d28b73 (diff)
update startup error handling
-rw-r--r--MediaBrowser.ServerApplication/MainStartup.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index dc61dcda8..63d2cf30d 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)
{