Merge pull request #875 from simplement-e/master

Changed the service startup process not to wait for init

MediaBrowser.ServerApplication/MainStartup.cs

@@ -226,14 +226,9 @@ namespace MediaBrowser.ServerApplication
                              ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
             }
 
-            var task = _appHost.Init(initProgress);
-            Task.WaitAll(task);
-
-            task = _appHost.RunStartupTasks();
-            Task.WaitAll(task);
 
-            SystemEvents.SessionEnding += SystemEvents_SessionEnding;
+            var task = _appHost.Init(initProgress);
-            SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
+            task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
 
             if (runService)
             {
@@ -241,6 +236,11 @@ namespace MediaBrowser.ServerApplication
             }
             else
             {
+                Task.WaitAll(task);
+
+                SystemEvents.SessionEnding += SystemEvents_SessionEnding;
+                SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
+   
                 HideSplashScreen();
 
                 ShowTrayIcon();