From 1337beed1ba61debe24f79057bd923cf8300cdb9 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 1 Mar 2020 16:49:37 -0600
Subject: [PATCH] remove designer null check hacks in favor of the intended
 DesignMode flag

---
 .../config/N64/N64ControllerSettingControl.cs | 21 ++++--------------
 .../config/N64/N64ControllersSetup.cs         |  5 +++++
 .../tools/Cheats/CheatEdit.cs                 | 22 ++++++++++---------
 .../tools/TAStudio/PlaybackBox.cs             | 13 ++++++-----
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.cs b/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.cs
index 7fc5f893fe..c2badf6a94 100644
--- a/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.cs
+++ b/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.cs
@@ -34,29 +34,16 @@ namespace BizHawk.Client.EmuHawk
 			set
 			{
 				EnabledCheckbox.Checked = value;
-				if (PakTypeDropdown != null) // Null check for designer
-				{
-					PakTypeDropdown.Enabled = value;
-				}
-
+				PakTypeDropdown.Enabled = value;
 				Refresh();
 			}
 		}
 
 		public N64SyncSettings.N64ControllerSettings.N64ControllerPakType PakType
 		{
-			get
-			{
-				if (PakTypeDropdown.SelectedItem != null) // Null check for designer
-				{
-					return PakTypeDropdown.SelectedItem
-						.ToString()
-						.GetEnumFromDescription<N64SyncSettings.N64ControllerSettings.N64ControllerPakType>();
-				}
-
-				return N64SyncSettings.N64ControllerSettings.N64ControllerPakType.NO_PAK;
-			}
-
+			get => PakTypeDropdown.SelectedItem
+				.ToString()
+				.GetEnumFromDescription<N64SyncSettings.N64ControllerSettings.N64ControllerPakType>();
 			set
 			{
 				if (PakTypeDropdown.Items.Count > 0) // Null check for designer
diff --git a/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs b/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs
index e279c73c35..01e5b004f3 100644
--- a/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs
+++ b/BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs
@@ -28,6 +28,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void N64ControllersSetup_Load(object sender, EventArgs e)
 		{
+			if (DesignMode)
+			{
+				return;
+			}
+
 			ControllerSettingControls
 				.ForEach(c =>
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
index 2b100126ea..91c419674e 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
@@ -37,19 +37,21 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			if (MemoryDomains != null) // the designer needs this check
+			if (DesignMode)
 			{
-				DomainDropDown.Items.Clear();
-				DomainDropDown.Items.AddRange(MemoryDomains
-					.Where(d => d.Writable)
-					.Select(d => d.ToString())
-					.ToArray());
-
-				DomainDropDown.SelectedItem = MemoryDomains.HasSystemBus
-					? MemoryDomains.SystemBus.ToString()
-					: MemoryDomains.MainMemory.ToString();
+				return;
 			}
 
+			DomainDropDown.Items.Clear();
+			DomainDropDown.Items.AddRange(MemoryDomains
+				.Where(d => d.Writable)
+				.Select(d => d.ToString())
+				.ToArray());
+
+			DomainDropDown.SelectedItem = MemoryDomains.HasSystemBus
+				? MemoryDomains.SystemBus.ToString()
+				: MemoryDomains.MainMemory.ToString();
+
 			SetFormToDefault();
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
index f32e89208c..c14e8dcc18 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
@@ -66,15 +66,16 @@ namespace BizHawk.Client.EmuHawk
 		protected override void OnLoad(EventArgs e)
 		{
 			base.OnLoad(e);
-
-			if (Tastudio != null) // For the designer
+			if (DesignMode)
 			{
-				TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false;
-				AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
-				FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
-				RecordingModeCheckbox.Checked = RecordingMode;
+				return;
 			}
 
+			TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false;
+			AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
+			FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
+			RecordingModeCheckbox.Checked = RecordingMode;
+
 			_loading = false;
 		}