From c774122fdb1dcfca3c85aa8fe0606ec2010c71ca Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Mon, 26 Oct 2020 16:58:45 +0800 Subject: [PATCH] fix: Disable update ACL after startup --- Netch/Forms/MainForm.MenuStrip.cs | 10 ++-------- Netch/Forms/MainForm.Status.cs | 9 +++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index cb9988c2..f93c6499 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -256,19 +256,13 @@ namespace Netch.Forms private async void UpdateACL(bool useProxy) { - void DisableItems(bool v) - { - UpdateACLToolStripMenuItem.Enabled = updateACLWithProxyToolStripMenuItem.Enabled = v; - } - if (useProxy && ServerComboBox.SelectedIndex == -1) { MessageBoxX.Show(i18N.Translate("Please select a server first")); return; } - DisableItems(false); - + Enabled = false; NotifyTip(i18N.Translate("Updating in the background")); try @@ -304,7 +298,7 @@ namespace Netch.Forms State = State.Stopped; } - DisableItems(true); + Enabled = true; } } diff --git a/Netch/Forms/MainForm.Status.cs b/Netch/Forms/MainForm.Status.cs index 28eeefb9..7758fce9 100644 --- a/Netch/Forms/MainForm.Status.cs +++ b/Netch/Forms/MainForm.Status.cs @@ -35,10 +35,11 @@ namespace Netch.Forms // 启动需要禁用的控件 UninstallServiceToolStripMenuItem.Enabled = - updateACLWithProxyToolStripMenuItem.Enabled = - UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = - UninstallTapDriverToolStripMenuItem.Enabled = - ReloadModesToolStripMenuItem.Enabled = enabled; + UpdateACLToolStripMenuItem.Enabled = + updateACLWithProxyToolStripMenuItem.Enabled = + UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = + UninstallTapDriverToolStripMenuItem.Enabled = + ReloadModesToolStripMenuItem.Enabled = enabled; } _state = value;