From 25a10d2635713a3da9e6fd9bce5d152f4fa5f5fb Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Sun, 15 Mar 2020 16:22:24 +0800
Subject: [PATCH] Fix #2830

---
 shadowsocks-csharp/View/ConfigForm.cs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
index 68fc3a7d..aa337e6e 100755
--- a/shadowsocks-csharp/View/ConfigForm.cs
+++ b/shadowsocks-csharp/View/ConfigForm.cs
@@ -575,21 +575,18 @@ namespace Shadowsocks.View
 
         private void MoveConfigItem(int step)
         {
-            int index = ServersListBox.SelectedIndex;
-            Server server = _modifiedConfiguration.configs[index];
-            object item = ServersListBox.Items[index];
+            var server = _modifiedConfiguration.configs[_lastSelectedIndex];
+            var newIndex = _lastSelectedIndex + step;
 
-            _modifiedConfiguration.configs.Remove(server);
-            _modifiedConfiguration.configs.Insert(index + step, server);
-            _modifiedConfiguration.index += step;
+            _modifiedConfiguration.configs.RemoveAt(_lastSelectedIndex);
+            _modifiedConfiguration.configs.Insert(newIndex, server);
 
             ServersListBox.BeginUpdate();
-            ServersListBox.Enabled = false;
-            _lastSelectedIndex = index + step;
-            ServersListBox.Items.Remove(item);
-            ServersListBox.Items.Insert(index + step, item);
-            ServersListBox.Enabled = true;
-            ServersListBox.SelectedIndex = index + step;
+
+            LoadServerNameListToUI(_modifiedConfiguration);
+
+            _lastSelectedIndex = newIndex;
+            ServersListBox.SelectedIndex = newIndex;
             ServersListBox.EndUpdate();
 
             UpdateButtons();