diff --git a/Misc/PKX.cs b/Misc/PKX.cs index 14b8d980e..a6106df32 100644 --- a/Misc/PKX.cs +++ b/Misc/PKX.cs @@ -2770,7 +2770,7 @@ namespace PKHeX } else if ((species == 521) && (gender == 1)) // Unfezant { - file = file = "_" + species.ToString() + "f"; + file = "_" + species.ToString() + "f"; } } if (species == 0) diff --git a/Misc/SplashScreen.cs b/Misc/SplashScreen.cs index 37f2d2c9d..6e75964e0 100644 --- a/Misc/SplashScreen.cs +++ b/Misc/SplashScreen.cs @@ -28,7 +28,7 @@ namespace PKHeX { if (m_parent.init) { - if (InvokeRequired) + if (InvokeRequired && IsHandleCreated) Invoke((MethodInvoker)delegate(){Close();}); else Close(); diff --git a/Misc/Util.cs b/Misc/Util.cs index b424db84c..ef1993ea0 100644 --- a/Misc/Util.cs +++ b/Misc/Util.cs @@ -214,6 +214,9 @@ namespace PKHeX internal static int getIndex(ComboBox cb) { int val = 0; + if (cb.SelectedValue == null) + return 0; + try { val = Util.ToInt32(cb.SelectedValue.ToString()); } catch {