michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Only try to shutdown server if actually running

Browse Source
This commit is contained in:
Eric Reed 2013-02-28 12:04:25 -05:00
parent 18f2ffd92c
commit cc574074b9
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Installer/MainWindow.xaml.cs
View File

@ -114,8 +114,8 @@ namespace MediaBrowser.Installer
var version = await GetPackageVersion(); var version = await GetPackageVersion();
lblStatus.Content = string.Format("Downloading {0} (version {1})...", FriendlyName, version.versionStr); lblStatus.Content = string.Format("Downloading {0} (version {1})...", FriendlyName, version.versionStr);
// Now 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 and it is running
if (PackageName == "MBServer") if (PackageName == "MBServer" && Process.GetProcessesByName("mediabrowser.serverapplication").Length != 0)
{ {
using (var client = new WebClient()) using (var client = new WebClient())
{ {

21
MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
View File

@ -79,18 +79,21 @@ namespace MediaBrowser.Uninstaller.Execute
if (Product == "Server") if (Product == "Server")
{ {
RemoveShortcut(Path.Combine(startMenu, "MB Dashboard.lnk")); RemoveShortcut(Path.Combine(startMenu, "MB Dashboard.lnk"));
using (var client = new WebClient()) if (Process.GetProcessesByName("mediabrowser.serverapplication").Length != 0)
{ {
lblHeading.Content = "Shutting Down Server..."; using (var client = new WebClient())
try
{ {
client.UploadString("http://localhost:8096/mediabrowser/system/shutdown", ""); lblHeading.Content = "Shutting Down Server...";
} try
catch (WebException ex)
{
if (ex.Status != WebExceptionStatus.ConnectFailure && !ex.Message.StartsWith("Unable to connect", StringComparison.OrdinalIgnoreCase))
{ {
MessageBox.Show("Error shutting down server. Please be sure it is not running before hitting OK.\n\n" + ex.Status + "\n\n" + ex.Message); client.UploadString("http://localhost:8096/mediabrowser/system/shutdown", "");
}
catch (WebException ex)
{
if (ex.Status != WebExceptionStatus.ConnectFailure && !ex.Message.StartsWith("Unable to connect", StringComparison.OrdinalIgnoreCase))
{
MessageBox.Show("Error shutting down server. Please be sure it is not running before hitting OK.\n\n" + ex.Status + "\n\n" + ex.Message);
}
} }
} }
} }