diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-25 10:40:16 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-25 10:40:16 -0500 |
| commit | aef805efb9e1655978bb1a71990f1060a3dcf768 (patch) | |
| tree | b1ef969377e2337d17cc2feb9a83ea774b12bb63 /MediaBrowser.ServerApplication | |
| parent | 7497fe9554482fcdf78ed49c436edba0b20c8350 (diff) | |
fix directory not found error in episode organization
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/MainStartup.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 7621d8b4b..6afe9367e 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -216,11 +216,7 @@ namespace MediaBrowser.ServerApplication var initProgress = new Progress<double>(); - if (runService) - { - StartService(logManager); - } - else + if (!runService) { ShowSplashScreen(_appHost.ApplicationVersion, initProgress, logManager.GetLogger("Splash")); @@ -235,18 +231,22 @@ namespace MediaBrowser.ServerApplication task = _appHost.RunStartupTasks(); Task.WaitAll(task); - if (!runService) + SystemEvents.SessionEnding += SystemEvents_SessionEnding; + SystemEvents.SessionSwitch += SystemEvents_SessionSwitch; + + if (runService) + { + StartService(logManager); + } + else { HideSplashScreen(); ShowTrayIcon(); + + task = ApplicationTaskCompletionSource.Task; + Task.WaitAll(task); } - - SystemEvents.SessionEnding += SystemEvents_SessionEnding; - SystemEvents.SessionSwitch += SystemEvents_SessionSwitch; - - task = ApplicationTaskCompletionSource.Task; - Task.WaitAll(task); } private static ServerNotifyIcon _serverNotifyIcon; |
