From 8a0295e4e93a5a3fc2418bc41630d086ec1d4ef1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 23 Apr 2020 20:54:20 -0700 Subject: [PATCH] Minor clean GetLanguageIndex never returns <0 --- PKHeX.Core/Game/GameStrings/GameLanguage.cs | 5 +++++ PKHeX.WinForms/MainWindow/Main.cs | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Game/GameStrings/GameLanguage.cs b/PKHeX.Core/Game/GameStrings/GameLanguage.cs index 8cd4bfa79..61fef2f46 100644 --- a/PKHeX.Core/Game/GameStrings/GameLanguage.cs +++ b/PKHeX.Core/Game/GameStrings/GameLanguage.cs @@ -13,6 +13,11 @@ public static class GameLanguage public static int LanguageCount => LanguageCodes.Length; + /// + /// Gets the language from the requested 2-char code. + /// + /// 2 character language code + /// Index of the language code; if not a valid language code, returns the . public static int GetLanguageIndex(string lang) { int l = Array.IndexOf(LanguageCodes, lang); diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 8894ba7c1..690756bd4 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -292,10 +292,7 @@ private void FormInitializeSecond() #endif // Select Language - int lang = GameLanguage.GetLanguageIndex(settings.Language); - if (lang < 0) - lang = GameLanguage.DefaultLanguageIndex; - CB_MainLanguage.SelectedIndex = lang; + CB_MainLanguage.SelectedIndex = GameLanguage.GetLanguageIndex(settings.Language); } private void FormLoadPlugins()