From 4b001a48a971189b4885da630a00ee8c2245dca3 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 23 Apr 2023 17:38:22 +1000
Subject: [PATCH] Dedup `GenericDebugger.EngageDebugger`

---
 .../tools/Debugger/GenericDebugger.cs         | 54 ++++++++-----------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 93298fb104..65278a2721 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -57,48 +57,44 @@ namespace BizHawk.Client.EmuHawk
 
 		private void EngageDebugger()
 		{
-			_disassemblyLines.Clear();
-			MainForm.OnPauseChanged += OnPauseChanged;
-			CancelSeekBtn.Enabled = false;
-			if (CanDisassemble)
+			Label GenDisabledCPUPicker(string text)
+				=> new()
+				{
+					Location = new(UIHelper.ScaleX(35), UIHelper.ScaleY(23)),
+					Size = new(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
+					Text = text,
+				};
+			Control GenCPUPicker()
 			{
 				try
 				{
 					if (CanSetCpu && Disassembler.AvailableCpus.CountIsAtLeast(2))
 					{
-						var c = new ComboBox
+						ComboBox c = new()
 						{
-							Location = new Point(UIHelper.ScaleX(35), UIHelper.ScaleY(17)),
+							DropDownStyle = ComboBoxStyle.DropDownList,
+							Location = new(UIHelper.ScaleX(35), UIHelper.ScaleY(17)),
 							Width = UIHelper.ScaleX(121),
-							DropDownStyle = ComboBoxStyle.DropDownList
 						};
-
 						c.Items.AddRange(Disassembler.AvailableCpus.Cast<object>().ToArray());
 						c.SelectedItem = Disassembler.Cpu;
 						c.SelectedIndexChanged += OnCpuDropDownIndexChanged;
-
-						DisassemblerBox.Controls.Add(c);
-					}
-					else
-					{
-						DisassemblerBox.Controls.Add(new Label
-						{
-							Location = new Point(UIHelper.ScaleX(35), UIHelper.ScaleY(23)),
-							Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
-							Text = Disassembler.Cpu
-						});
+						return c;
 					}
 				}
 				catch (NotImplementedException)
 				{
-					DisassemblerBox.Controls.Add(new Label
-					{
-						Location = new Point(UIHelper.ScaleX(35), UIHelper.ScaleY(23)),
-						Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
-						Text = Disassembler.Cpu
-					});
+					// fall through
 				}
+				return GenDisabledCPUPicker(Disassembler.Cpu);
+			}
 
+			_disassemblyLines.Clear();
+			MainForm.OnPauseChanged += OnPauseChanged;
+			CancelSeekBtn.Enabled = false;
+			if (CanDisassemble)
+			{
+				DisassemblerBox.Controls.Add(GenCPUPicker());
 				_pcRegisterSize = PCRegister.BitSize / 4;
 				SetDisassemblerItemCount();
 				UpdatePC();
@@ -108,13 +104,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				DisassemblerBox.Enabled = false;
 				DisassemblerView.RowCount = 0;
-				DisassemblerBox.Controls.Add(new Label
-				{
-					Location = new Point(UIHelper.ScaleX(35), UIHelper.ScaleY(23)),
-					Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
-					Text = "Unknown"
-				});
-
+				DisassemblerBox.Controls.Add(GenDisabledCPUPicker("Unknown"));
 				toolTip1.SetToolTip(DisassemblerBox, "This core does not currently support disassembling");
 			}