From 89bc92b98e291612e6c6aa5e1dca4664222f2f99 Mon Sep 17 00:00:00 2001 From: Sam Song Date: Thu, 12 Mar 2020 22:39:32 +0800 Subject: [PATCH] =?UTF-8?q?Fixes=20#390=20=E5=85=81=E8=AE=B8=E6=9D=A5?= =?UTF-8?q?=E8=87=AA=E5=B1=80=E5=9F=9F=E7=BD=91=E7=9A=84=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BA=BA=E5=B7=A5=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当修改参数设置时,除重新加载v2ray外也重新启动HTTP代理, 否则,需要用户人工退出再启动。 如果没有开启HTTP代理,因为修改参数设置触发的重启HTTP代理不做任何操作。 --- v2rayN/v2rayN/Forms/MainForm.cs | 12 ++++++++++-- v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 3ef6cd89..4c69f799 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -348,12 +348,19 @@ namespace v2rayN.Forms { Utils.SetClipboardData(e.ClickedItem.Text); } + } + + #endregion + + #region http proxy 操作 + private void RestartHttpProxy() + { + HttpProxyHandle.RestartHttpAgent(config, true); } - #endregion #region v2ray 操作 - + /// /// 载入V2ray /// @@ -703,6 +710,7 @@ namespace v2rayN.Forms //刷新 RefreshServers(); LoadV2ray(); + RestartHttpProxy(); } } diff --git a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs index a2e4e486..88009e5d 100644 --- a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs +++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs @@ -121,6 +121,11 @@ namespace v2rayN.HttpProxyHandler public static void RestartHttpAgent(Config config, bool forced) { bool isRestart = false; + if (config.listenerType == 0) + { + // 关闭http proxy时,直接返回 + return; + } //强制重启或者socks端口变化 if (forced) {