mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-05-23 23:26:07 -05:00
Fix nickname checked for first pkm loaded
Language combobox isn't set, so the nickname detection thinks the 'none' language'd pkm nickname does not match the supplied nickname. Disable this check until fields are loaded.
This commit is contained in:
parent
14818ca9e2
commit
10c45e06b9
|
|
@ -805,8 +805,8 @@ private void openSAV(byte[] input, string path)
|
|||
private void loadSAV(SaveFile sav, string path)
|
||||
{
|
||||
// clean fields
|
||||
populateFields(SAV.BlankPKM);
|
||||
PKM pk = preparePKM();
|
||||
populateFields(SAV.BlankPKM);
|
||||
SAV = sav;
|
||||
|
||||
if (path != null) // Actual save file
|
||||
|
|
@ -1096,7 +1096,7 @@ private void loadSAV(SaveFile sav, string path)
|
|||
}
|
||||
bool init = fieldsInitialized;
|
||||
fieldsInitialized = fieldsLoaded = false;
|
||||
pkm = (pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk;
|
||||
pkm = pkm.GetType() != SAV.PKMType ? SAV.BlankPKM : pk;
|
||||
populateFilteredDataSources();
|
||||
populateFields(pkm);
|
||||
fieldsInitialized |= init;
|
||||
|
|
@ -3297,6 +3297,8 @@ private void updateU64(object sender, EventArgs e)
|
|||
|
||||
private void updateIsNicknamed(object sender, EventArgs e)
|
||||
{
|
||||
if (!fieldsLoaded)
|
||||
return;
|
||||
if (!CHK_Nicknamed.Checked)
|
||||
{
|
||||
int species = Util.getIndex(CB_Species);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user