GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-05-11 23:45:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve Force Exit

Browse Source
This commit is contained in:
ChsBuffer
2021-01-15 19:42:49 +08:00
parent a1fdf7ead2
commit c50ca563b2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Netch/Forms/MainForm.cs
View File

@@ -1069,10 +1069,6 @@ namespace Netch.Forms
ProfileGroupBox.Enabled = true;
StartDisableItems(true);
break;
case State.Terminating:
Dispose();
Environment.Exit(Environment.ExitCode);
return;
}
}
}
@@ -1279,7 +1275,7 @@ namespace Netch.Forms
Hide();
}
private void Exit(bool forceExit = false)
private async void Exit(bool forceExit = false)
{
if (!IsWaiting() && !Global.Settings.StopWhenExited && !forceExit)
{
@@ -1289,18 +1285,20 @@ namespace Netch.Forms
return;
}
Hide();
State = State.Terminating;
NotifyIcon.Visible = false;
if (!IsWaiting())
ControlButton_Click(null, null);
Hide();
Configuration.Save();
foreach (var file in new[] {"data\\last.json", "data\\privoxy.conf"})
if (File.Exists(file))
File.Delete(file);
State = State.Terminating;
if (!IsWaiting())
await MainController.Stop();
Dispose();
Environment.Exit(Environment.ExitCode);
}
private void OnCalled(object sender, OnlyInstance.Commands e)