v1.2.1

CatmanFan · Jun 11, 2024 · cfeb92a · cfeb92a
1 parent d8f7eaf
commit cfeb92a
Show file tree

Hide file tree

Showing 9 changed files with 483 additions and 1,317 deletions.
diff --git a/FriishProduce/ProjectForm.cs b/FriishProduce/ProjectForm.cs
@@ -214,8 +214,8 @@ public void RefreshForm()
 
             for (int i = 0; i < Base.Items.Count; i++)
             {
-                var title = channelData.Entries[i].Regions.Contains(0) && Program.Lang.Current.StartsWith("ja") ? channelData.Entries[i].Titles[0]
-                          : channelData.Entries[i].Regions.Contains(0) && Program.Lang.Current.StartsWith("ko") ? channelData.Entries[i].Titles[channelData.Entries[i].Titles.Count - 1]
+                var title = channelData.Entries[i].Regions.Contains(0) && Program.Lang.Current.ToLower().StartsWith("ja") ? channelData.Entries[i].Titles[0]
+                          : channelData.Entries[i].Regions.Contains(0) && Program.Lang.Current.ToLower().StartsWith("ko") ? channelData.Entries[i].Titles[channelData.Entries[i].Titles.Count - 1]
                           : channelData.Entries[i].Regions.Contains(0) && channelData.Entries[i].Regions.Count > 1 ? channelData.Entries[i].Titles[1]
                           : channelData.Entries[i].Titles[0];
 
@@ -1404,8 +1404,17 @@ private void Base_SelectedIndexChanged(object sender, EventArgs e)
                 { "-MX", 3 },
                 { "-BR", 3 },
             };
+
             foreach (var item in altRegions) if (Program.Lang.Current.ToLower().StartsWith(item.Key) || (item.Key.Contains("-") && Program.Lang.Current.ToLower().EndsWith(item.Key)))
-                    selected = regions.IndexOf(item.Value == 0 ? Program.Lang.String("region_j") : item.Value == 1 ? Program.Lang.String("region_k") : item.Value == 2 ? Program.Lang.String("region_e") : Program.Lang.String("region_u"));
+            {
+                selected = regions.IndexOf(item.Value == 0 ? Program.Lang.String("region_j")
+                         : item.Value == 1 ? Program.Lang.String("region_k")
+                         : item.Value == 2 ? Program.Lang.String("region_e")
+                         : Program.Lang.String("region_u"));
+
+                if (selected == -1 && item.Value == 1) selected = regions.IndexOf(Program.Lang.String("region_u"));
+                break;
+            }
 
             if (selected == -1) selected = 0;
 

diff --git a/FriishProduce/SettingsForm.Designer.cs b/FriishProduce/SettingsForm.Designer.cs
diff --git a/FriishProduce/SettingsForm.cs b/FriishProduce/SettingsForm.cs
@@ -365,19 +365,12 @@ private void OK_Click(object sender, EventArgs e)
             // -------------------------------------------
             // Restart message box & save changes
             // -------------------------------------------
+            SaveAll();
+
             if (isDirty)
-            {
-                if (MessageBox.Show(Program.Lang.Msg(0), MessageBox.Buttons.YesNo) == MessageBox.Result.Yes)
-                {
-                    SaveAll();
-                    Application.Restart();
-                }
-            }
-            else
-            {
-                SaveAll();
-                DialogResult = DialogResult.OK;
-            }
+                MessageBox.Show(Program.Lang.Msg(0));
+
+            DialogResult = DialogResult.OK;
         }
 
         private void Cancel_Click(object sender, EventArgs e)