Merge pull request #473 from GangZhuo/master

Minor fixes
2016-03-04 16:09:48 +08:00
parent 40d208e3c2 3da00178de
commit b01aced174
2 changed files with 13 additions and 3 deletions
@@ -196,7 +196,12 @@ namespace Shadowsocks.Controller
                _inboundSpeedRecords.TryGetValue(id, out inboundSpeedRecords);
                _outboundSpeedRecords.TryGetValue(id, out outboundSpeedRecords);
                _latencyRecords.TryGetValue(id, out latencyRecords);
-                records.Add(id, new StatisticsRecord(id, inboundSpeedRecords, outboundSpeedRecords, latencyRecords));
+                StatisticsRecord record = new StatisticsRecord(id, inboundSpeedRecords, outboundSpeedRecords, latencyRecords);
+                /* duplicate server identifier */
+                if (records.ContainsKey(id))
+                    records[id] = record;
+                else
+                    records.Add(id, record);
            }

            if (Config.Ping)
@@ -49,8 +49,13 @@ namespace Shadowsocks.Controller
                {
                    try
                    {
-                        p.Kill();
-                        p.WaitForExit();
+                        p.CloseMainWindow();
+                        p.WaitForExit(100);
+                        if (!p.HasExited)
+                        {
+                            p.Kill();
+                            p.WaitForExit();
+                        }
                    }
                    catch (Exception e)
                    {