From a70b5eeef595b68d254196de363e8e56c35f3f10 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 15 May 2021 11:53:39 +0800
Subject: [PATCH] up4.17

---
 v2rayN/v2rayN/Forms/MainForm.cs                 | 17 +++++++++++++----
 .../v2rayN/HttpProxyHandler/HttpProxyHandle.cs  | 14 ++++++++++++--
 v2rayN/v2rayN/Properties/AssemblyInfo.cs        |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index cabc221d..d6fdd983 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -33,7 +33,7 @@ namespace v2rayN.Forms
 
             Application.ApplicationExit += (sender, args) =>
             {
-                MyAppExit();
+                MyAppExit(false);
             };
         }
 
@@ -88,8 +88,10 @@ namespace v2rayN.Forms
                 case CloseReason.ApplicationExitCall:
                 case CloseReason.FormOwnerClosing:
                 case CloseReason.TaskManagerClosing:
+                    MyAppExit(false);
+                    break;
                 case CloseReason.WindowsShutDown:
-                    MyAppExit();
+                    MyAppExit(true);
                     break;
             }
         }
@@ -105,14 +107,21 @@ namespace v2rayN.Forms
 
             //}
         }
-        private void MyAppExit()
+        private void MyAppExit(bool blWindowsShutDown)
         {
             try
             {
                 v2rayHandler.V2rayStop();
 
                 //HttpProxyHandle.CloseHttpAgent(config);
-                HttpProxyHandle.UpdateSysProxy(config, true);
+                if (blWindowsShutDown)
+                {
+                    HttpProxyHandle.ResetIEProxy4WindowsShutDown();
+                }
+                else
+                {
+                    HttpProxyHandle.UpdateSysProxy(config, true);
+                }
 
                 ConfigHandler.SaveConfig(ref config);
                 statistics?.SaveToFile();
diff --git a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
index e6a02a49..890352dc 100644
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
@@ -170,8 +170,6 @@ namespace v2rayN.HttpProxyHandler
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
-                    //TODO To be verified
-                    Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
                     SysProxyHandle.ResetIEProxy();
                 }
                 else if (type == ESysProxyType.Unchanged)
@@ -184,5 +182,17 @@ namespace v2rayN.HttpProxyHandler
             }
             return true;
         }
+
+        public static void ResetIEProxy4WindowsShutDown()
+        {
+            try
+            {
+                //TODO To be verified
+                Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
+            }
+            catch
+            {
+            }
+        }
     }
 }
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index d4384b65..0807f7b5 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("4.16")]
+[assembly: AssemblyFileVersion("4.17")]