diff --git a/Netch/Controllers/UpdateChecker.cs b/Netch/Controllers/UpdateChecker.cs index ca6b4105..b1892ebe 100644 --- a/Netch/Controllers/UpdateChecker.cs +++ b/Netch/Controllers/UpdateChecker.cs @@ -26,7 +26,7 @@ namespace Netch.Controllers public const string Name = @"Netch"; public const string Copyright = @"Copyright © 2019 - 2020"; - public const string Version = @"1.3.7"; + public const string Version = @"1.3.8"; public async void Check(bool notifyNoFound, bool isPreRelease) { diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 246257c2..af146549 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -204,10 +204,10 @@ namespace Netch.Forms SelectLastMode(); } - public void UpdateMode(Models.Mode NewMode,int OldModeIndex) + public void UpdateMode(Models.Mode NewMode, Models.Mode OldMode) { ModeComboBox.Items.Clear(); - Global.ModeFiles.RemoveAt(OldModeIndex); + Global.ModeFiles.Remove(OldMode); Global.ModeFiles.Add(NewMode); var array = Global.ModeFiles.ToArray(); Array.Sort(array, (a, b) => string.Compare(a.Remark, b.Remark, StringComparison.Ordinal)); @@ -1128,7 +1128,7 @@ namespace Netch.Forms SaveConfigs(); var selectedMode = (Models.Mode)ModeComboBox.SelectedItem; //Process.Start(Environment.CurrentDirectory + "\\mode\\" + selectedMode.FileName + ".txt"); - Mode.Process process = new Mode.Process(selectedMode, ModeComboBox.SelectedIndex); + Mode.Process process = new Mode.Process(selectedMode); process.Text = "Edit Process Mode"; process.Show(); Hide(); diff --git a/Netch/Forms/Mode/Process.cs b/Netch/Forms/Mode/Process.cs index 5e6732f5..bed3dc18 100644 --- a/Netch/Forms/Mode/Process.cs +++ b/Netch/Forms/Mode/Process.cs @@ -10,19 +10,19 @@ namespace Netch.Forms.Mode //用于判断当前窗口是否为编辑模式 private Boolean EditMode = false; //被编辑模式坐标 - private int EditMode_Index = -1; + private Models.Mode EditMode_Old = null; /// /// 编辑模式 /// /// 模式 - public Process(Models.Mode mode, int ModeIndex) + public Process(Models.Mode mode) { InitializeComponent(); CheckForIllegalCrossThreadCalls = false; - EditMode_Index = ModeIndex; + EditMode_Old = mode; this.Text = "Edit Process Mode"; //循环填充已有规则 mode.Rule.ForEach(i => RuleListBox.Items.Add(i)); @@ -45,7 +45,7 @@ namespace Netch.Forms.Mode CheckForIllegalCrossThreadCalls = false; EditMode = false; - EditMode_Index = -1; + EditMode_Old = null; } /// @@ -222,7 +222,7 @@ namespace Netch.Forms.Mode MessageBox.Show(Utils.i18N.Translate("Mode updated successfully"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information); - Global.MainForm.UpdateMode(mode, EditMode_Index); + Global.MainForm.UpdateMode(mode, EditMode_Old); Close(); } else