Merge pull request #940 from MrAnks/master

Update MainStartup.cs
This commit is contained in:
Luke 2014-11-07 17:37:45 -05:00
commit 44a7825294

View File

@ -224,7 +224,7 @@ namespace MediaBrowser.ServerApplication
if (!runService) if (!runService)
{ {
ShowSplashScreen(_appHost.ApplicationVersion, initProgress, logManager.GetLogger("Splash")); if (!options.ContainsOption("-nosplash")) ShowSplashScreen(_appHost.ApplicationVersion, initProgress, logManager.GetLogger("Splash"));
// Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT | SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |