From a39689d62d99ea7bb6d905587b35088f0fa65384 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Thu, 28 Nov 2024 07:52:14 +1000
Subject: [PATCH] Fix duplicate `Form.Dispose` implementation

fixes 6d2d07428
---
 .../tools/BasicBot/BasicBot.Designer.cs             | 13 -------------
 .../tools/BasicBot/BasicBot.cs                      |  6 +++++-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
index 3eb0b62e6d..077cf892d3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs
@@ -9,19 +9,6 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private System.ComponentModel.IContainer components = null;
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
 		#region Windows Form Designer generated code
 
 		/// <summary>
diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
index 661ce4034f..62aed29b75 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
@@ -1076,7 +1076,11 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void Dispose(bool disposing)
 		{
-			if (_isBotting) RestoreConfigFlags(); // disposed while running? least we can do is not clobber config
+			if (disposing)
+			{
+				components?.Dispose();
+				if (_isBotting) RestoreConfigFlags(); // disposed while running? least we can do is not clobber config
+			}
 			base.Dispose(disposing: disposing);
 		}