remove global http proxy; reset proxy when system ends

Author: Cenmrev

V2RayW/App.xaml

@@ -2,7 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:V2RayW"
-             StartupUri="MainWindow.xaml">
+             StartupUri="MainWindow.xaml"
+             SessionEnding="App_SessionEnding"
+             >
     <Application.Resources>
 
     </Application.Resources>

V2RayW/App.xaml.cs

@@ -13,6 +13,10 @@ namespace V2RayW
     /// </summary>
     public partial class App : Application
     {
-
+        void App_SessionEnding(object sender, SessionEndingCancelEventArgs e)
+        {
+            (MainWindow as V2RayW.MainWindow).QuitV2RayW(sender, null);
+        }
     }
+
 }

V2RayW/ConfigWindow.xaml.cs

@@ -180,16 +180,6 @@ private void VmessListBox_SelectionChanged(object sender, SelectionChangedEventA
 
         #region closewindow
 
-        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
-        {
-            e.Cancel = true;
-            this.Hide();
-        }
-
-        private void CheckInputs()
-        {
-        }
-
         private void HideWindow(object sender, RoutedEventArgs e)
         {
             if(sender == saveConfigButton)
@@ -238,9 +228,11 @@ private void HideWindow(object sender, RoutedEventArgs e)
                 mainWindow.udpSupport = udpSupportBox.IsChecked ?? false;
                 mainWindow.logLevel = logLevelBox.SelectedItem.ToString();
 
+
                 mainWindow.OverallChanged(this, null);
+
             }
-            this.Hide();
+            this.Close();
         }
         #endregion
 

V2RayW/MainWindow.xaml.cs

@@ -40,8 +40,6 @@ public partial class MainWindow : Window
 
         private TaskbarIcon notifyIcon;
 
-        private ConfigWindow configWindow;
-
 
         public bool proxyState = false;
         public ProxyMode proxyMode = ProxyMode.manual;
@@ -468,6 +466,10 @@ public void OverallChanged(object sender, RoutedEventArgs e)
             }
             this.UpdateStatusAndModeMenus();
             this.UpdatePacMenuList();
+            if(sender.GetType().Equals(typeof(ConfigWindow)))
+            {
+                WriteSettings();
+            }
         }
         #endregion
 
@@ -506,7 +508,7 @@ public void UpdateSystemProxy()
             } else if (proxyMode == ProxyMode.global)
             {
                 registry.SetValue("ProxyEnable", 1);
-                var proxyServer = $"http=127.0.0.1:{httpPort};socks=127.0.0.1:{localPort}";
+                var proxyServer = $"http://127.0.0.1:{httpPort}";
                 var proxyOverride = "<local>;localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;172.32.*;192.168.*";
                 registry.SetValue("ProxyServer", proxyServer);
                 registry.SetValue("ProxyOverride", proxyOverride);
@@ -780,7 +782,11 @@ private void InitializeCoreProcess()
             v2rayProcess.StartInfo.FileName = AppDomain.CurrentDomain.BaseDirectory + @"v2ray-core\v2ray.exe";
             Debug.WriteLine(v2rayProcess.StartInfo.FileName);
             v2rayProcess.StartInfo.Arguments = @"-config http://127.0.0.1:18000/config.json";
+#if DEBUG
+            v2rayProcess.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
+#else
             v2rayProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+#endif
             v2rayCoreWorker.DoWork += V2rayCoreWorker_DoWork;
             v2rayCoreWorker.RunWorkerAsync();
         }
@@ -820,9 +826,9 @@ void ToggleCore()
             this.UnloadV2ray();
             coreWorkerSemaphore.Release(1);
         }
-        #endregion
+#endregion
 
-        #region core config management
+#region core config management
         byte[] v2rayJsonConfig = new byte[0];
 
         void CoreConfigChanged(object sender)
@@ -848,9 +854,13 @@ byte[] GenerateConfigFile()
             Dictionary<string, object> fullConfig = Utilities.configTemplate;
             fullConfig["log"] = new Dictionary<string, string>
             {
-                {"loglevel", logLevel },
+#if DEBUG
+                {"loglevel", "debug" }
+#else
                 { "error",AppDomain.CurrentDomain.BaseDirectory + @"log\error.log" },
-                { "access", AppDomain.CurrentDomain.BaseDirectory + @"log\access.log"}
+                { "access", AppDomain.CurrentDomain.BaseDirectory + @"log\access.log"},
+                {"loglevel", logLevel }
+#endif
             };
             var dnsList = dnsString.Split(',');
             if(dnsList.Count() > 0)
@@ -943,9 +953,9 @@ byte[] GenerateConfigFile()
             }
             return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(fullConfig, Formatting.Indented));
         }
-        #endregion
+#endregion
 
-        #region routingRules 
+#region routingRules 
         void UpdateRuleSetMenuList()
         {
             Debug.WriteLine($"rules count = {routingRuleSets.Count}");
@@ -975,12 +985,12 @@ void SwitchRoutingRuleSet(object sender, RoutedEventArgs e)
             this.CoreConfigChanged(sender);
         }
 
-        #endregion
+#endregion
 
 
-        #region other main menu items
+#region other main menu items
 
-        private void QuitV2RayW(object sender, RoutedEventArgs e)
+        public void QuitV2RayW(object sender, RoutedEventArgs e)
         {
             notifyIcon.Icon = null;
             this.UnloadV2ray();
@@ -1006,25 +1016,20 @@ private void ShowHelp(object sender, RoutedEventArgs e)
 
         private void ShowConfigWindow(object sender, RoutedEventArgs e)
         {
-            if (this.configWindow == null)
+            ConfigWindow configWindow = new ConfigWindow
             {
-                this.configWindow = new ConfigWindow
-                {
-                    mainWindow = this
-                };
-                
-            }
-            this.configWindow.InitializeData();
-            this.configWindow.Show();
-            this.configWindow.Focus();
+                mainWindow = this
+            };
+            configWindow.InitializeData();
+            configWindow.Show();
         }
 
         private void ViewCurrentConfig(object sender, RoutedEventArgs e)
         {
             Process.Start("http://127.0.0.1:18000/config.json");
         }
 
-        #endregion
+#endregion
 
         private void ShowLogMenuItem_Click(object sender, RoutedEventArgs e)
         {