jie65535/GrasscutterCommandGenerator
1
0
Fork 0
mirror of https://github.com/jie65535/GrasscutterCommandGenerator.git synced 2025-06-06 22:39:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix proxy close issue

Browse Source
This commit is contained in:
杰 2024-03-24 23:24:52 +08:00
parent 5b2442591f
commit 055bddc22c
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/GrasscutterTools/Forms/FormMain.cs
View File

@ -164,7 +164,9 @@ namespace GrasscutterTools.Forms
// 遍历每一个页面，通知关闭
foreach (var page in Pages.Values)
{
Logger.I(TAG, $"{page.Name} OnClosed enter");
page.OnClosed();
Logger.I(TAG, $"{page.Name} OnClosed completed");
}
// 保存当前设置

31
Source/GrasscutterTools/Pages/PageProxy.cs
View File

@ -40,6 +40,8 @@ namespace GrasscutterTools.Pages
TxtHost.Text = Settings.Default.Host;
ChkAutoStart.Checked = Settings.Default.AutoStartProxy;
Application.ApplicationExit += OnApplicationExit;
if (Settings.Default.AutoStartProxy && !ProxyHelper.IsRunning)
{
Logger.I(Name, "Auto start proxy!");
@ -47,11 +49,36 @@ namespace GrasscutterTools.Pages
}
}
/// <summary>
/// 当应用程序退出时触发
/// </summary>
private void OnApplicationExit(object sender, EventArgs e)
{
if (!ProxyHelper.IsRunning) return;
Logger.I(Name, "OnApplicationExit: StopProxy...");
// 停止代理
StopProxy();
}
/// <summary>
/// 当页面被关闭时触发
/// </summary>
public override void OnClosed()
{
if (!ProxyHelper.IsRunning) return;
Logger.I(Name, "OnPageClosed: StopProxy...");
// 停止代理
StopProxy();
}
/// <summary>
/// 停止代理
/// </summary>
private static void StopProxy()
{
try
{
Logger.I(Name, "Stop Proxy");
Logger.I("PageProxy", "Stop Proxy");
ProxyHelper.StopProxy();
}
catch (Exception ex)
@ -59,7 +86,7 @@ namespace GrasscutterTools.Pages
#if DEBUG
MessageBox.Show(ex.ToString(), Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
#endif
Logger.E(Name, "Stop Proxy Failed.", ex);
Logger.E("PageProxy", "Stop Proxy Failed.", ex);
}
}