close ffmpeg more gracefully

1 files changed, 12 insertions, 3 deletions

diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 4f143aaf7c..3ea45bc4fb 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -527,18 +527,27 @@ namespace MediaBrowser.ServerApplication
 
             if (!_isRunningAsService)
             {
-                _logger.Info("Executing windows forms restart");
+                _logger.Info("Hiding server notify icon");
                 _serverNotifyIcon.Visible = false;
-                Application.Restart();
 
-                ShutdownWindowsApplication();
+                _logger.Info("Executing windows forms restart");
+                //Application.Restart();
+                Process.Start(_appHost.ServerConfigurationManager.ApplicationPaths.ApplicationPath);
+
+                _logger.Info("Calling Application.Exit");
+                Environment.Exit(0);
             }
         }
 
         private static void ShutdownWindowsApplication()
         {
+            _logger.Info("Hiding server notify icon");
             _serverNotifyIcon.Visible = false;
+
+            _logger.Info("Calling Application.Exit");
             Application.Exit();
+
+            _logger.Info("Calling ApplicationTaskCompletionSource.SetResult");
             ApplicationTaskCompletionSource.SetResult(true);
         }