fix windows restart hang

2 files changed, 17 insertions, 8 deletions

diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 968172bc3a..d7b8b2aed4 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -214,7 +214,7 @@ namespace MediaBrowser.ServerApplication
                 fileSystem,
                 "MBServer",
                 nativeApp);
-            
+
             var initProgress = new Progress<double>();
 
             if (!runService)
@@ -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 7257207319..ad0bd8a1af 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -168,6 +168,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)