Browse Source

Merge cc43a3d083 into f33da19f06

pull/237/merge
git-720516 10 years ago
parent
commit
6f5aa38dcb
2 changed files with 0 additions and 8 deletions
  1. +0
    -3
      shadowsocks-csharp/Controller/ShadowsocksController.cs
  2. +0
    -5
      shadowsocks-csharp/Controller/SystemProxy.cs

+ 0
- 3
shadowsocks-csharp/Controller/ShadowsocksController.cs View File

@@ -137,7 +137,6 @@ namespace Shadowsocks.Controller
public void Stop()
{
Console.WriteLine("Stop");
if (stopped)
{
return;
@@ -184,7 +183,6 @@ namespace Shadowsocks.Controller
protected void Reload()
{
Console.WriteLine("Reload");
// some logic in configuration updated the config when saving, we need to read it again
_config = Configuration.Load();
@@ -259,7 +257,6 @@ namespace Shadowsocks.Controller
private void UpdateSystemProxy()
{
Console.WriteLine("UpdateSystemProxy");
if (_config.enabled)
{
SystemProxy.Enable(_config.global);


+ 0
- 5
shadowsocks-csharp/Controller/SystemProxy.cs View File

@@ -60,19 +60,14 @@ namespace Shadowsocks.Controller
{
try
{
Console.WriteLine("Disable");
RegistryKey registry =
Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
true);
Console.WriteLine("Disable1");
registry.SetValue("ProxyEnable", 0);
registry.SetValue("ProxyServer", "");
registry.SetValue("AutoConfigURL", "");
Console.WriteLine("Disable2");
SystemProxy.NotifyIE();
Console.WriteLine("Disable3");
CopyProxySettingFromLan();
Console.WriteLine("Disable4");
}
catch (Exception e)
{


Loading…
Cancel
Save