From 18f2ffd92cc98328a70f843be8d993bf6b2eb1ac Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Thu, 28 Feb 2013 11:43:00 -0500 Subject: [PATCH] Don't async the server shutdown in installer This way we can allow them to do it manually if it fails --- MediaBrowser.Installer/MainWindow.xaml.cs | 29 ++++++++++------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs index fe672ec07c..4268e57572 100644 --- a/MediaBrowser.Installer/MainWindow.xaml.cs +++ b/MediaBrowser.Installer/MainWindow.xaml.cs @@ -114,25 +114,22 @@ namespace MediaBrowser.Installer var version = await GetPackageVersion(); lblStatus.Content = string.Format("Downloading {0} (version {1})...", FriendlyName, version.versionStr); - // Now in the background - try and shut down the server if that is what we are installing + // Now try and shut down the server if that is what we are installing if (PackageName == "MBServer") { - Task.Run(async () => - { - using (var client = new WebClient()) - { - try - { - await client.UploadStringTaskAsync("http://localhost:8096/mediabrowser/system/shutdown", "").ConfigureAwait(false); - } - catch (WebException e) - { - if (e.GetStatus() == HttpStatusCode.NotFound || e.Message.StartsWith("Unable to connect",StringComparison.OrdinalIgnoreCase)) return; // just wasn't running + using (var client = new WebClient()) + { + try + { + client.UploadString("http://localhost:8096/mediabrowser/System/Shutdown", ""); + } + catch (WebException e) + { + if (e.GetStatus() == HttpStatusCode.NotFound || e.Message.StartsWith("Unable to connect",StringComparison.OrdinalIgnoreCase)) return; // just wasn't running - MessageBox.Show("Error shutting down server.\n\n" + e.GetStatus() + "\n\n" + e.Message); - } - } - }); + MessageBox.Show("Error shutting down server. Please be sure it is not running before hitting OK.\n\n" + e.GetStatus() + "\n\n" + e.Message); + } + } } // Download