mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-16 18:42:52 -07:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
0cd583c300
@ -103,6 +103,27 @@ 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
|
||||
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
|
||||
|
||||
MessageBox.Show("Error shutting down server.\n\n" + e.GetStatus() + "\n\n" + e.Message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Download
|
||||
var archive = await DownloadPackage(version);
|
||||
dlAnimation.StopAnimation();
|
||||
|
@ -29,7 +29,7 @@
|
||||
<PublisherName>Media Browser Team</PublisherName>
|
||||
<SuiteName>Media Browser</SuiteName>
|
||||
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
|
||||
<ApplicationRevision>17</ApplicationRevision>
|
||||
<ApplicationRevision>21</ApplicationRevision>
|
||||
<ApplicationVersion>0.1.1.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||
|
Loading…
Reference in New Issue
Block a user