diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 91aac00f3..644c881d7 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -199,6 +199,8 @@ private void FormLoadInitialFiles(string[] args) { var ver = Settings.Default.DefaultSaveVersion; var sav = SaveUtil.GetBlankSAV(ver, "PKHeX"); + if (sav.Version == GameVersion.Invalid) // will fail to load + sav = SaveUtil.GetBlankSAV((GameVersion)GameInfo.VersionDataSource.Max(z => z.Value), "PKHeX"); OpenSAV(sav, null); C_SAV.SAV.Edited = false; // Prevents form close warning from showing until changes are made } diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.cs b/PKHeX.WinForms/Subforms/SettingsEditor.cs index dc0b05483..6d738fc96 100644 --- a/PKHeX.WinForms/Subforms/SettingsEditor.cs +++ b/PKHeX.WinForms/Subforms/SettingsEditor.cs @@ -24,8 +24,9 @@ public SettingsEditor(object obj, params string[] blacklist) if (obj is Settings s) { + var noSelectVersions = new[] {GameVersion.GO}; CB_Blank.InitializeBinding(); - CB_Blank.DataSource = GameInfo.VersionDataSource; + CB_Blank.DataSource = GameInfo.VersionDataSource.Where(z => !noSelectVersions.Contains((GameVersion)z.Value)).ToList(); CB_Blank.SelectedValue = (int) s.DefaultSaveVersion; CB_Blank.SelectedValueChanged += (_, __) => s.DefaultSaveVersion = (GameVersion)WinFormsUtil.GetIndex(CB_Blank); }