Merge pull request #2543 from Stzx/master

[fixes #2542] Fix accidental index invalidation
shadowsocks · Sep 5, 2019 · 25e2b82 · 25e2b82
2 parents 67e630f + 174cf57
commit 25e2b82
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
+
 using Shadowsocks.Controller;
 using Shadowsocks.Model;
 using Shadowsocks.Properties;
@@ -157,7 +158,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool
 
                 LoadServerNameListToUI(_modifiedConfiguration);
 
-                _lastSelectedIndex = (ServersListBox.SelectedIndex = lastIndex);
+                _lastSelectedIndex = (ServersListBox.SelectedIndex = ( _lastSelectedIndex == ServersListBox.Items.Count ? lastIndex : lastIndex - 1));
 
                 ServersListBox.SelectedIndexChanged += ServersListBox_SelectedIndexChanged;
                 return true;