From 648f2503032b4e64ad07f2cb176f8e6f187d9523 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 29 Dec 2017 16:50:55 -0800 Subject: [PATCH] Fix party/other tab loading for sav loads loading pbr/rsbox -> loading a game that has party & daycare causes the daycare tab to be loaded in the incorrect spot. PartyTab needs to be calculated closer to its use --- PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs index 7a1d4686e..34b345682 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs @@ -889,12 +889,11 @@ public bool ToggleInterface() ToggleViewReset(); ToggleViewSubEditors(SAV); - int BoxTab = tabBoxMulti.TabPages.IndexOf(Tab_Box); - int PartyTab = tabBoxMulti.TabPages.IndexOf(Tab_PartyBattle); - bool WindowTranslationRequired = false; WindowTranslationRequired |= ToggleViewBox(SAV); + int BoxTab = tabBoxMulti.TabPages.IndexOf(Tab_Box); WindowTranslationRequired |= ToggleViewParty(SAV, BoxTab); + int PartyTab = tabBoxMulti.TabPages.IndexOf(Tab_PartyBattle); WindowTranslationRequired |= ToggleViewDaycare(SAV, BoxTab, PartyTab); SetPKMBoxes(); // Reload all of the PKX Windows @@ -956,7 +955,6 @@ private bool ToggleViewParty(SaveFile sav, int BoxTab) } private bool ToggleViewDaycare(SaveFile sav, int BoxTab, int PartyTab) { - if (!sav.HasDaycare) { if (tabBoxMulti.TabPages.Contains(Tab_Other))