From a6104cb19212073c45104b8d753eb63a20692dd4 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 13 Sep 2015 21:26:26 +0900
Subject: [PATCH] =?utf8?q?=E4=B8=8A=E6=B5=81=E3=83=97=E3=83=AD=E3=82=AD?=
 =?utf8?q?=E3=82=B7=E3=81=AE=E5=A4=89=E6=9B=B4=E6=99=82=E3=81=AB=E3=83=97?=
 =?utf8?q?=E3=83=AD=E3=82=AD=E3=82=B7=E3=82=92=E5=86=8D=E8=B5=B7=E5=8B=95?=
 =?utf8?q?=E3=81=97=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/Config.cs   |  2 --
 KancolleSniffer/MainForm.cs | 21 +++++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index 217504e..c4a15e1 100644
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -41,8 +41,6 @@ namespace KancolleSniffer
             UseUpstream = false;
             UpstreamPort = 8888;
         }
-
-        public ProxyConfig Clone() => (ProxyConfig)MemberwiseClone();
     }
 
     public class ShipListConfig
diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 1f07af8..b06667b 100644
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -50,7 +50,7 @@ namespace KancolleSniffer
         private string _debugLogFile;
         private IEnumerator<string> _playLog;
         private LogServer _logServer;
-        private ProxyConfig _prevProxy;
+        private int _prevProxyPort;
         private readonly SystemProxy _systemProxy = new SystemProxy();
 
         public MainForm()
@@ -133,7 +133,6 @@ namespace KancolleSniffer
         private void MainForm_Load(object sender, EventArgs e)
         {
             _config.Load();
-            _prevProxy = _config.Proxy.Clone();
             RestoreLocation();
             if (_config.HideOnMinimized && WindowState == FormWindowState.Minimized)
                 ShowInTaskbar = false;
@@ -226,10 +225,14 @@ namespace KancolleSniffer
         {
             if (!_config.Proxy.Auto)
                 _systemProxy.RestoreSettings();
+            if (_config.Proxy.UseUpstream)
+            {
+                HttpProxy.UpstreamProxyHost = "127.0.0.1";
+                HttpProxy.UpstreamProxyPort = _config.Proxy.UpstreamPort;
+            }
+            HttpProxy.IsEnableUpstreamProxy = _config.Proxy.UseUpstream;
             var result = true;
-            if (!HttpProxy.IsInListening || _config.Proxy.Listen != _prevProxy.Listen ||
-                _config.Proxy.UseUpstream != _prevProxy.UseUpstream ||
-                _config.Proxy.UpstreamPort != _prevProxy.UpstreamPort)
+            if (!HttpProxy.IsInListening || _config.Proxy.Listen != _prevProxyPort)
             {
                 ShutdownProxy();
                 result = StartProxy();
@@ -240,18 +243,12 @@ namespace KancolleSniffer
                     ? ProxyConfig.AutoConfigUrl
                     : ProxyConfig.AutoConfigUrlWithPort + HttpProxy.LocalPort);
             }
-            _prevProxy = _config.Proxy.Clone();
+            _prevProxyPort = _config.Proxy.Listen;
             return result;
         }
 
         private bool StartProxy()
         {
-            if (_config.Proxy.UseUpstream)
-            {
-                HttpProxy.UpstreamProxyHost = "127.0.0.1";
-                HttpProxy.UpstreamProxyPort = _config.Proxy.UpstreamPort;
-            }
-            HttpProxy.IsEnableUpstreamProxy = _config.Proxy.UseUpstream;
             try
             {
                 HttpProxy.Startup(_config.Proxy.Listen, false, false);
-- 
2.11.0