diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs index a74c5b99d3..810bedcf47 100644 --- a/Netch/Controllers/MainController.cs +++ b/Netch/Controllers/MainController.cs @@ -140,7 +140,7 @@ public async Task Start(Server server, Mode mode) } catch (Exception e) { - Logging.Error("加密代理启动失败未处理异常: " + e); + Logging.Error("加密代理启动失败，未处理异常: " + e); result = false; } } @@ -180,7 +180,7 @@ public async Task Start(Server server, Mode mode) if (e is DllNotFoundException || e is FileNotFoundException) MessageBoxX.Show(e.Message + "\n\n" + i18N.Translate("Missing File or runtime components"), owner: Global.MainForm); else - Logging.Error("模式启动失败未处理异常" + e); + Logging.Error("模式启动失败，未处理异常: " + e); result = false; } } @@ -222,7 +222,14 @@ public async Task Start(Server server, Mode mode) if (!result) { Logging.Error("主控制器启动失败"); - await Stop(); + try + { + await Stop(); + } + catch + { + // ignored + } } return result; diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs index b60893f4d4..51577262ad 100644 --- a/Netch/Forms/MainForm.Designer.cs +++ b/Netch/Forms/MainForm.Designer.cs @@ -56,7 +56,6 @@ private void InitializeComponent() this.AboutToolStripButton = new System.Windows.Forms.ToolStripButton(); this.VersionLabel = new System.Windows.Forms.ToolStripLabel(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RelyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ConfigurationGroupBox = new System.Windows.Forms.GroupBox(); this.configLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.ProfileLabel = new System.Windows.Forms.Label(); @@ -116,8 +115,7 @@ private void InitializeComponent() this.OptionsToolStripMenuItem, this.AboutToolStripButton, this.VersionLabel, - this.exitToolStripMenuItem, - this.RelyToolStripMenuItem}); + this.exitToolStripMenuItem}); this.MenuStrip.Location = new System.Drawing.Point(0, 0); this.MenuStrip.Name = "MenuStrip"; this.MenuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; @@ -313,15 +311,6 @@ private void InitializeComponent() this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // - // RelyToolStripMenuItem - // - this.RelyToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; - this.RelyToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.RelyToolStripMenuItem.Name = "RelyToolStripMenuItem"; - this.RelyToolStripMenuItem.Size = new System.Drawing.Size(244, 22); - this.RelyToolStripMenuItem.Text = "Unable to start? Click me to download"; - this.RelyToolStripMenuItem.Click += new System.EventHandler(this.RelyToolStripMenuItem_Click); - // // ConfigurationGroupBox // this.ConfigurationGroupBox.Controls.Add(this.configLayoutPanel); @@ -754,7 +743,6 @@ private void InitializeComponent() private System.Windows.Forms.TableLayoutPanel ProfileTable; private System.Windows.Forms.ToolStripMenuItem reinstallTapDriverToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ReloadModesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem RelyToolStripMenuItem; private System.Windows.Forms.ComboBox ServerComboBox; private System.Windows.Forms.Label ServerLabel; private System.Windows.Forms.ToolStripMenuItem ServerToolStripMenuItem; diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index b83f3404d3..111346238f 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -358,11 +358,6 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e) Exit(true); } - private void RelyToolStripMenuItem_Click(object sender, EventArgs e) - { - Utils.Utils.Open("https://mega.nz/file/9OQ1EazJ#0pjJ3xt57AVLr29vYEEv15GSACtXVQOGlEOPpi_2Ico"); - } - private void VersionLabel_Click(object sender, EventArgs e) { Utils.Utils.Open($"https://github.com/{UpdateChecker.Owner}/{UpdateChecker.Repo}/releases"); diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 1f67f57251..44992023cd 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -208,7 +208,6 @@ private void InitText() AboutToolStripButton.Text = i18N.Translate("About"); // VersionLabel.Text = i18N.Translate("xxx"); exitToolStripMenuItem.Text = i18N.Translate("Exit"); - RelyToolStripMenuItem.Text = i18N.Translate("Unable to start? Click me to download"); ConfigurationGroupBox.Text = i18N.Translate("Configuration"); ProfileLabel.Text = i18N.Translate("Profile"); ModeLabel.Text = i18N.Translate("Mode"); diff --git a/Netch/NativeMethods.cs b/Netch/NativeMethods.cs index 2574e63dbf..6edd21f724 100644 --- a/Netch/NativeMethods.cs +++ b/Netch/NativeMethods.cs @@ -16,23 +16,11 @@ public static class NativeMethods [DllImport("bin\\NetchCore", CallingConvention = CallingConvention.Cdecl, EntryPoint = "CreateRoute")] public static extern bool CreateRoute(string address, int cidr, string gateway, int index, int metric = 0); - /// - /// 修改路由规则 - /// - /// 目标地址 - /// CIDR - /// 网关地址 - /// 适配器索引 - /// 跃点数 - /// 是否成功 - [DllImport("bin\\NetchCore", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ChangeRoute")] - public static extern bool ChangeRoute(string address, int cidr, string gateway, int index, int metric = 0); - /// /// 删除路由规则 /// /// 目标地址 - /// 掩码地址 + /// 掩码地址 /// 网关地址 /// 适配器索引 /// 跃点数 diff --git a/Netch/Utils/Configuration.cs b/Netch/Utils/Configuration.cs index c5e2133c22..9909998315 100644 --- a/Netch/Utils/Configuration.cs +++ b/Netch/Utils/Configuration.cs @@ -70,12 +70,11 @@ public static void Load() { // 弹出提示 i18N.Load("System"); - MessageBoxX.Show(i18N.Translate("If this is your first time using this software,\n please check https://netch.org to install supports first,\n or the program may report errors.")); + // MessageBoxX.Show(i18N.Translate("If this is your first time using this software,\n please check https://netch.org to install supports first,\n or the program may report errors.")); // 创建 data 文件夹并保存默认设置 Save(); } - } /// diff --git a/binaries b/binaries index f5f744ab52..422c811311 160000 --- a/binaries +++ b/binaries @@ -1 +1 @@ -Subproject commit f5f744ab5291724338bc83caa3b83ab78cd1d8bf +Subproject commit 422c811311eadb4f3aa628e3354b5ac0bfa94453