From e808618981fd58505f00d88400d4a9be1f234a2c Mon Sep 17 00:00:00 2001
From: Isotarge <6367891+Isotarge@users.noreply.github.com>
Date: Fri, 19 Oct 2018 12:35:14 +1030
Subject: [PATCH] TAStudio: Squish some more exceptions

- Opening a TASProj or closing BizHawk with the Virtual Pad open
- Opening TAStudio with small window size saved in settings
---
 .../tools/TAStudio/TAStudio.cs                | 19 +++++++++++++++++--
 .../tools/VirtualPads/VirtualpadsTool.cs      |  5 ++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index e90d64ee6a..bfc1b12614 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -283,12 +283,27 @@ namespace BizHawk.Client.EmuHawk
 
 			if (Settings.MainVerticalSplitDistance > 0)
 			{
-				MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance;
+				try
+				{
+					MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance;
+				}
+				catch (Exception)
+				{
+					MainVertialSplit.SplitterDistance = defaultMainSplitDistance;
+				}
+				
 			}
 
 			if (Settings.BranchMarkerSplitDistance > 0)
 			{
-				BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
+				try
+				{
+					BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
+				}
+				catch (Exception)
+				{
+					BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance;
+				}
 			}
 
 			RefreshDialog();
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
index 80f2952046..5b81afb644 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
@@ -182,7 +182,10 @@ namespace BizHawk.Client.EmuHawk
 			if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
 			{
 				Readonly = true;
-				Pads.ForEach(p => p.Set(Global.MovieSession.CurrentInput));
+				if (Global.MovieSession.CurrentInput != null)
+				{
+					Pads.ForEach(p => p.Set(Global.MovieSession.CurrentInput));
+				}
 			}
 			else
 			{