From bcb220bc4b2c96f09f25e1b5ce182bbfbd09935d Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Fri, 23 Oct 2020 12:33:52 +0800 Subject: [PATCH] Revert "refactor: MainForm change Enabled to change State" This reverts commit abfae4a9a0acd24f9559ca06dd4b94c214d2a5c7. --- Netch/Forms/MainForm.MenuStrip.cs | 19 +++++++------------ Netch/Forms/MainForm.cs | 4 ++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index faf79b4e..b48b3d23 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -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; } } diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 6817c424..29707818 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -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(); }