From 698e080312dba58d3794ff7f0d2928df6f6822f6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 2 Jan 2015 21:25:10 +0000
Subject: [PATCH] Tastudio - fix in the designer

---
 .../tools/TAStudio/PlaybackBox.cs             | 19 ++++++++++++-------
 .../tools/TAStudio/TAStudio.Designer.cs       |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
index 4772e146e0..34e4eaf0bd 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
@@ -62,11 +62,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public PlaybackBox(TAStudio tastudio)
+		public PlaybackBox()
 		{
-			Tastudio = tastudio;
 			InitializeComponent();
-			
 		}
 
 		protected override void OnLoad(EventArgs e)
@@ -74,10 +72,17 @@ namespace BizHawk.Client.EmuHawk
 			base.OnLoad(e);
 
 			_programmaticallyChangingValue = true;
-			
-			TurboSeekCheckbox.Checked = Global.Config.TurboSeek;
-			AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
-			FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
+
+			if (Global.Config != null) // For the designer
+			{
+				TurboSeekCheckbox.Checked = Global.Config.TurboSeek;
+			}
+
+			if (Tastudio != null) // For the designer
+			{
+				AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
+				FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
+			}
 
 			_programmaticallyChangingValue = false;
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index b21a9e766b..3612d75499 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -105,7 +105,7 @@ namespace BizHawk.Client.EmuHawk
 			this.TasStatusStrip = new StatusStripEx();
 			this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
 			this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(this);
+			this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
 			this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
 			this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();