Merge pull request #875 from simplement-e/master
Changed the service startup process not to wait for init
This commit is contained in:
commit
bcaadd59be
|
@ -224,23 +224,23 @@ namespace MediaBrowser.ServerApplication
|
|||
// Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
|
||||
SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |
|
||||
ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
|
||||
}
|
||||
|
||||
var task = _appHost.Init(initProgress);
|
||||
Task.WaitAll(task);
|
||||
|
||||
task = _appHost.RunStartupTasks();
|
||||
Task.WaitAll(task);
|
||||
|
||||
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
|
||||
SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
|
||||
}
|
||||
|
||||
|
||||
var task = _appHost.Init(initProgress);
|
||||
task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
|
||||
|
||||
if (runService)
|
||||
{
|
||||
{
|
||||
StartService(logManager);
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
Task.WaitAll(task);
|
||||
|
||||
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
|
||||
SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
|
||||
|
||||
HideSplashScreen();
|
||||
|
||||
ShowTrayIcon();
|
||||
|
|
Loading…
Reference in New Issue
Block a user