lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows restart hang

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-30 00:07:21 -04:00
parent 11754a2fb2
commit 459e483b4e
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
View File

@ -158,9 +158,14 @@ namespace MediaBrowser.Common.Implementations.Security
return new SupporterInfo();
}
var url = MbAdmin.HttpsUrl + "/service/supporter/retrieve?key=" + key;
var data = new Dictionary<string, string>
{
{ "key", key },
};
using (var stream = await _httpClient.Get(url, CancellationToken.None).ConfigureAwait(false))
var url = MbAdmin.HttpsUrl + "/service/supporter/retrieve";
using (var stream = await _httpClient.Post(url, data, CancellationToken.None).ConfigureAwait(false))
{
var response = _jsonSerializer.DeserializeFromStream<SuppporterInfoResponse>(stream);
@ -269,4 +274,4 @@ namespace MediaBrowser.Common.Implementations.Security
_isMbSupporterInitialized = false;
}
}
}
}

12
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -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();

13
MediaBrowser.ServerApplication/ServerNotifyIcon.cs
View File

@ -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)