From 15303fd49f0d33e86278ae1f1b177a523f1b145d Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Tue, 4 Aug 2015 21:54:43 -0400
Subject: [PATCH] Tastudio - branches - fix crash when dropping a branch onto
 an invalid area

---
 .../tools/TAStudio/BookmarksBranchesBox.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index ba7fb1e86d..d0c246570f 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -305,14 +305,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BranchView_CellDropped(object sender, InputRoll.CellEventArgs e)
 		{
-			if (e.NewCell != null && e.NewCell.IsDataCell)
+			if (e.NewCell != null && e.NewCell.IsDataCell && e.OldCell.RowIndex.Value < Branches.Count)
 			{
 				var branch = Branches[e.OldCell.RowIndex.Value];
 				int originalIndex = Branches.IndexOf(branch);
 				int newIndex = e.NewCell.RowIndex.Value;
 
-                if (newIndex >= Branches.Count)
-                    newIndex = Branches.Count - 1;
+				if (newIndex >= Branches.Count)
+					newIndex = Branches.Count - 1;
 
 				Branches.Remove(branch);
 				Branches.Insert(newIndex, branch);