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:17:12 -0400
commit29dbc95254ba5e0db3c293dcc0e08827dd09f870 (patch)
treef5e4f66962b7d984db8fe5f881d459cc5f6b14cb
parent41d551b35d9acd1c76b035349a662dc09b93ee91 (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 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)
{