add validation

kzwr · Feb 6, 2016 · ef02035 · ef02035
1 parent d930083
commit ef02035
Showing 1 changed file with 37 additions and 16 deletions.
diff --git a/Titanium.Web.Proxy/Helpers/SystemProxy.cs b/Titanium.Web.Proxy/Helpers/SystemProxy.cs
@@ -66,14 +66,24 @@ public static void RemoveHttpProxy()
                     "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true);
             if (reg != null)
             {
-                var exisitingContent = reg.GetValue("ProxyServer") as string;
-
-                var existingSystemProxyValues = GetSystemProxyValues(exisitingContent);
-                existingSystemProxyValues.RemoveAll(x => !x.IsSecure);
-
-
-                reg.SetValue("ProxyEnable", 1);
-                reg.SetValue("ProxyServer", String.Join(";", existingSystemProxyValues.Select(x => x.ToString()).ToArray()));
+                if (reg.GetValue("ProxyServer")!=null)
+                {
+                    var exisitingContent = reg.GetValue("ProxyServer") as string;
+
+                    var existingSystemProxyValues = GetSystemProxyValues(exisitingContent);
+                    existingSystemProxyValues.RemoveAll(x => !x.IsSecure);
+
+                    if (!(existingSystemProxyValues.Count() == 0))
+                    {
+                        reg.SetValue("ProxyEnable", 1);
+                        reg.SetValue("ProxyServer", String.Join(";", existingSystemProxyValues.Select(x => x.ToString()).ToArray()));
+                    }
+                    else
+                    {
+                        reg.SetValue("ProxyEnable", 0);
+                        reg.SetValue("ProxyServer", string.Empty);
+                    }
+                }
             }
 
             Refresh();
@@ -112,14 +122,25 @@ public static void RemoveHttpsProxy()
                     "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true);
             if (reg != null)
             {
-                var exisitingContent = reg.GetValue("ProxyServer") as string;
-
-                var existingSystemProxyValues = GetSystemProxyValues(exisitingContent);
-                existingSystemProxyValues.RemoveAll(x => x.IsSecure);
-
-
-                reg.SetValue("ProxyEnable", 1);
-                reg.SetValue("ProxyServer", String.Join(";", existingSystemProxyValues.Select(x => x.ToString()).ToArray()));
+                if (reg.GetValue("ProxyServer") != null)
+                {
+                    var exisitingContent = reg.GetValue("ProxyServer") as string;
+
+                    var existingSystemProxyValues = GetSystemProxyValues(exisitingContent);
+                    existingSystemProxyValues.RemoveAll(x => x.IsSecure);
+
+                    if (!(existingSystemProxyValues.Count() == 0))
+                    {
+                        reg.SetValue("ProxyEnable", 1);
+                        reg.SetValue("ProxyServer", String.Join(";", existingSystemProxyValues.Select(x => x.ToString()).ToArray()));
+                    }
+                    else
+                    {
+                        reg.SetValue("ProxyEnable", 0);
+                        reg.SetValue("ProxyServer", string.Empty);
+                    }
+
+                }
             }
 
             Refresh();