Fixing some unneccessary exceptions.

This commit is contained in:
Souji Seta 2014-11-27 03:26:39 -06:00
parent 30d64a3d2d
commit ffe297b895
3 changed files with 5 additions and 2 deletions

View file

@ -2770,7 +2770,7 @@ namespace PKHeX
} }
else if ((species == 521) && (gender == 1)) // Unfezant else if ((species == 521) && (gender == 1)) // Unfezant
{ {
file = file = "_" + species.ToString() + "f"; file = "_" + species.ToString() + "f";
} }
} }
if (species == 0) if (species == 0)

View file

@ -28,7 +28,7 @@ namespace PKHeX
{ {
if (m_parent.init) if (m_parent.init)
{ {
if (InvokeRequired) if (InvokeRequired && IsHandleCreated)
Invoke((MethodInvoker)delegate(){Close();}); Invoke((MethodInvoker)delegate(){Close();});
else else
Close(); Close();

View file

@ -214,6 +214,9 @@ namespace PKHeX
internal static int getIndex(ComboBox cb) internal static int getIndex(ComboBox cb)
{ {
int val = 0; int val = 0;
if (cb.SelectedValue == null)
return 0;
try { val = Util.ToInt32(cb.SelectedValue.ToString()); } try { val = Util.ToInt32(cb.SelectedValue.ToString()); }
catch catch
{ {