Refactor ToolManager.Close

that ought to cover everything
TASEmulators · Jul 15, 2024 · f742fe5 · f742fe5
1 parent f9cdad2
commit f742fe5
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -662,8 +662,19 @@ public void Close(Type toolType)
 
 		public void Close()
 		{
-			_tools.ForEach(t => t.Close());
+			var toolsCopy = _tools.ToArray();
 			_tools.Clear();
+			foreach (var t in toolsCopy)
+			{
+				try
+				{
+					t.Close();
+				}
+				catch (Exception e)
+				{
+					Console.WriteLine($"caught while calling Form.Close on tool: {e}");
+				}
+			}
 		}
 
 		/// <summary>