aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-11-07 22:50:20 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-11-07 22:50:20 -0500
commit9be4e12d00c979be98d2a0e7f21b1cfaf07607bd (patch)
tree0471b9e70d31c3ec59dedd4ab1bd4f2f0000f458
parent86e733978e27e174394e58c6781aa9f77012dd92 (diff)
parent44a78252942ae828d043bfe3b310c8bc0b074162 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.ServerApplication/MainStartup.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index c47dc2155..e6cea5463 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -224,7 +224,7 @@ namespace MediaBrowser.ServerApplication
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
SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |