更新NetchCore.dll, 移除安装运行库提示

netchx · Aug 9, 2020 · 26cde4a · 26cde4a
1 parent e5e7892
commit 26cde4a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 38 deletions.
diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -140,7 +140,7 @@ public async Task<bool> Start(Server server, Mode mode)
                 }
                 catch (Exception e)
                 {
-                    Logging.Error("加密代理启动失败未处理异常: " + e);
+                    Logging.Error("加密代理启动失败，未处理异常: " + e);
                     result = false;
                 }
             }
@@ -180,7 +180,7 @@ public async Task<bool> 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<bool> 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
diff --git 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
@@ -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
@@ -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);
 
-        /// <summary>
-        ///		修改路由规则
-        /// </summary>
-        /// <param name="address">目标地址</param>
-        /// <param name="cidr">CIDR</param>
-        /// <param name="gateway">网关地址</param>
-        /// <param name="index">适配器索引</param>
-        /// <param name="metric">跃点数</param>
-        /// <returns>是否成功</returns>
-        [DllImport("bin\\NetchCore", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ChangeRoute")]
-        public static extern bool ChangeRoute(string address, int cidr, string gateway, int index, int metric = 0);
-
         /// <summary>
         ///		删除路由规则
         /// </summary>
         /// <param name="address">目标地址</param>
-        /// <param name="netmask">掩码地址</param>
+        /// <param name="cidr">掩码地址</param>
         /// <param name="gateway">网关地址</param>
         /// <param name="index">适配器索引</param>
         /// <param name="metric">跃点数</param>

diff --git 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();
             }
-
         }
 
         /// <summary>

diff --git a/binaries b/binaries