From 71780d401f9521d7b76ac773e7b048de55ff2380 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 21 Sep 2015 21:05:33 -0400 Subject: fix windows restart --- MediaBrowser.ServerApplication/MainStartup.cs | 10 +++------- MediaBrowser.ServerApplication/ServerNotifyIcon.cs | 13 +++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 968172bc3a..80b7d230ab 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -513,23 +513,19 @@ namespace MediaBrowser.ServerApplication if (!_isRunningAsService) { - _logger.Info("Hiding server notify icon"); - _serverNotifyIcon.Visible = false; + //_logger.Info("Hiding server notify icon"); + //_serverNotifyIcon.Visible = false; _logger.Info("Starting new instance"); //Application.Restart(); Process.Start(_appHost.ServerConfigurationManager.ApplicationPaths.ApplicationPath); - _logger.Info("Calling Environment.Exit"); - Environment.Exit(0); + ShutdownWindowsApplication(); } } private static void ShutdownWindowsApplication() { - _logger.Info("Hiding server notify icon"); - _serverNotifyIcon.Visible = false; - _logger.Info("Calling Application.Exit"); Application.Exit(); diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs index 3501c8c278..dd9e5d5f00 100644 --- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs +++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs @@ -140,6 +140,19 @@ namespace MediaBrowser.ServerApplication } notifyIcon1.DoubleClick += notifyIcon1_DoubleClick; + Application.ApplicationExit += Application_ApplicationExit; + } + + void Application_ApplicationExit(object sender, EventArgs e) + { + try + { + notifyIcon1.Visible = false; + } + catch + { + + } } void notifyIcon1_DoubleClick(object sender, EventArgs e) -- cgit v1.2.3