From a3e69cbcb3f3a4670f7bbb7a3bbd21926e3f427a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=93=9D=E7=82=B9lilac?= <yourena0528@gmail.com>
Date: Fri, 13 Nov 2020 04:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=92=A4=E9=94=80=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ContextMenuManager/Controls/AboutApp.cs | 45 +++++++++++++++----------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/ContextMenuManager/Controls/AboutApp.cs b/ContextMenuManager/Controls/AboutApp.cs
index cd284c5..f85c432 100644
--- a/ContextMenuManager/Controls/AboutApp.cs
+++ b/ContextMenuManager/Controls/AboutApp.cs
@@ -216,8 +216,6 @@ namespace ContextMenuManager.Controls
 
         readonly List<string> iniPaths = new List<string>();
 
-        int selectIndex = 0;
-
         protected override void OnResize(EventArgs e)
         {
             base.OnResize(e);
@@ -234,38 +232,51 @@ namespace ContextMenuManager.Controls
         {
             cmbLanguages.Items.Clear();
             cmbLanguages.Items.Add("(默认) 简体中文");
-            cmbLanguages.SelectedIndex = 0;
+
             string str = AppString.Other.Translators + Environment.NewLine;
             DirectoryInfo di = new DirectoryInfo(Program.LanguagesDir);
             if(di.Exists)
             {
                 iniPaths.Clear();
                 FileInfo[] fis = di.GetFiles();
-                for(int i = 0; i < fis.Length; i++)
+                foreach(FileInfo fi in fis)
                 {
-                    FileInfo fi = fis[i];
-                    IniReader reader = new IniReader(fi.FullName);
-                    string name = reader.GetValue("General", "Language");
-                    string translator = reader.GetValue("General", "Translator");
-                    cmbLanguages.Items.Add(name);
-                    str += Environment.NewLine + name + "\t\t" + translator;
                     iniPaths.Add(fi.FullName);
-                    if(fi.FullName.Equals(Program.LanguageFilePath, StringComparison.OrdinalIgnoreCase))
-                        cmbLanguages.SelectedIndex = i + 1;
+                    IniReader reader = new IniReader(fi.FullName);
+                    string language = reader.GetValue("General", "Language");
+                    string translator = reader.GetValue("General", "Translator");
+                    str += Environment.NewLine + language + new string('\t', 5) + translator;
+                    cmbLanguages.Items.Add(language);
                 }
                 txtTranslators.Text = str;
+                cmbLanguages.SelectedIndex = GetSelectIndex();
             }
-            selectIndex = cmbLanguages.SelectedIndex;
         }
 
         private void ChangeLanguage()
         {
-            if(cmbLanguages.SelectedIndex == selectIndex) return;
             string path = "default";
+            int index = GetSelectIndex();
+            if(cmbLanguages.SelectedIndex == index) return;
             if(cmbLanguages.SelectedIndex > 0) path = iniPaths[cmbLanguages.SelectedIndex - 1];
-            new IniFileHelper(Program.ConfigIniPath).SetValue("General", "Language", path);
-            MessageBoxEx.Show(AppString.MessageBox.RestartApp, MessageBoxButtons.OK, MessageBoxIcon.Information);
-            Application.Restart();
+            if(MessageBoxEx.Show(AppString.MessageBox.RestartApp, MessageBoxButtons.OKCancel) != DialogResult.OK)
+            {
+                cmbLanguages.SelectedIndex = index;
+            }
+            else
+            {
+                new IniFileHelper(Program.ConfigIniPath).SetValue("General", "Language", path);
+                Application.Restart();
+            }
+        }
+
+        private int GetSelectIndex()
+        {
+            for(int i = 0; i < iniPaths.Count; i++)
+            {
+                if(iniPaths[i].Equals(Program.LanguageFilePath, StringComparison.OrdinalIgnoreCase)) return i + 1;
+            }
+            return 0;
         }
     }
 }
\ No newline at end of file