diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-22 12:34:36 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-22 12:34:36 -0400 |
| commit | 3386e8f8f7382ea95b655f1a5a66d9761ad341d5 (patch) | |
| tree | cd77eee9bbe535baa63e05c1bb1df8d95614c6f7 /MediaBrowser.ServerApplication | |
| parent | 55a4510fd386b7cfa4c46de0c26ae614f4fecd57 (diff) | |
| parent | 87aa923d36b4714d3cf9e98ec5a3063a773adcfd (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/MainStartup.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index ac1b7ca99..f83c7d545 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -555,9 +555,10 @@ namespace MediaBrowser.ServerApplication private static void ShutdownWindowsApplication() { - _logger.Info("Calling Application.Exit"); - Application.Exit(); + //_logger.Info("Calling Application.Exit"); + //Application.Exit(); + _logger.Info("Calling Environment.Exit"); Environment.Exit(0); _logger.Info("Calling ApplicationTaskCompletionSource.SetResult"); |