GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-18 18:13:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: MainForm change Enabled to change State"

Browse Source 
This reverts commit abfae4a9a0.
This commit is contained in:
ChsBuffer
2020-10-23 12:33:52 +08:00
parent c50eb32828
commit bcb220bc4b
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Netch/Forms/MainForm.MenuStrip.cs
View File

@@ -298,36 +298,32 @@ namespace Netch.Forms
private async void UninstallServiceToolStripMenuItem_Click(object sender, EventArgs e)
{
State = State.Starting;
Enabled = false;
StatusText(i18N.TranslateFormat("Uninstalling {0}", "NF Service"));
var result = false;
try
{
await Task.Run(() =>
{
if (NFController.UninstallDriver())
{
result = true;
StatusText(i18N.TranslateFormat("{0} has been uninstalled", "NF Service"));
}
});
}
finally
{
State = State.Stopped;
if (result)
StatusText(i18N.TranslateFormat("{0} has been uninstalled", "NF Service"));
Enabled = true;
}
}
private async void reinstallTapDriverToolStripMenuItem_Click(object sender, EventArgs e)
{
State = State.Starting;
StatusText(i18N.TranslateFormat("Uninstalling {0}", "TUN/TAP driver"));
var result = false;
Enabled = false;
try
{
await Task.Run(TUNTAP.deltapall);
result = true;
StatusText(i18N.TranslateFormat("{0} has been uninstalled", "TUN/TAP driver"));
}
catch (Exception exception)
{
@@ -335,9 +331,8 @@ namespace Netch.Forms
}
finally
{
State = State.Stopped;
if (result)
StatusText(i18N.TranslateFormat("{0} has been uninstalled", "TUN/TAP driver"));
State = State.Waiting;
Enabled = true;
}
}

4
Netch/Forms/MainForm.cs
View File

@@ -334,7 +334,7 @@ namespace Netch.Forms
private async void SpeedPictureBox_Click(object sender, EventArgs e)
{
State = State.Starting;
Enabled = false;
StatusText(i18N.Translate("Testing"));
try
{
@@ -342,7 +342,7 @@ namespace Netch.Forms
}
finally
{
State = State.Stopped;
Enabled = true;
StatusText(i18N.Translate("Test done"));
Refresh();
}