From f04d492bcef47df69fb15ff4e1df500a72525b62 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 11 Nov 2016 18:05:51 -0800
Subject: [PATCH] Safety check boxlayout selected index

Closes #380
---
 PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
index ffb0d7371..a06cfefd0 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs	
@@ -51,7 +51,7 @@ public SAV_BoxLayout(int box)
                 CB_Unlocked.Items.Clear();
                 for (int i = 0; i < SAV.BoxCount; i++)
                     CB_Unlocked.Items.Add(i + 1);
-                CB_Unlocked.SelectedIndex = SAV.BoxesUnlocked;
+                CB_Unlocked.SelectedIndex = Math.Min(SAV.BoxCount - 1, SAV.BoxesUnlocked);
             }
             else
             {