From 6acf4ae6fbb37633c7f2a2d2a4b98d9dda09169c Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 26 Jul 2020 03:33:33 +1000
Subject: [PATCH] Tiny ToolManager.Load cleanup 2 electric boogaloo

see 2d6bac879, 7c3ccd664
---
 .../tools/ToolManager.cs                      | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 9e0529e3e6..b09cfd7617 100644
--- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -64,10 +64,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				throw new ArgumentException($"Type {toolType.Name} does not implement {nameof(IToolForm)}.");
 			}
-			
-			// The type[] in parameter is used to avoid an ambiguous name exception
-			MethodInfo method = GetType().GetMethod("Load", new Type[] { typeof(bool) }).MakeGenericMethod(toolType);
-			return (IToolForm)method.Invoke(this, new object[] { focus });
+
+			return (IToolForm) typeof(ToolManager).GetMethod("Load", new[] { typeof(bool), typeof(string) })
+				.MakeGenericMethod(toolType)
+				.Invoke(this, new object[] { focus, "" });
 		}
 
 		// If the form inherits ToolFormBase, it will set base properties such as Tools, Config, etc
@@ -87,23 +87,11 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// Loads the tool dialog T (T must implement <see cref="IToolForm"/>) , if it does not exist it will be created, if it is already open, it will be focused
 		/// </summary>
-		/// <typeparam name="T">Type of tool you want to load</typeparam>
 		/// <param name="focus">Define if the tool form has to get the focus or not (Default is true)</param>
-		/// <returns>An instantiated <see cref="IToolForm"/></returns>
-		public T Load<T>(bool focus = true)
-			where T : class, IToolForm
-		{
-			return Load<T>("", focus);
-		}
-
-		/// <summary>
-		/// Loads the tool dialog T (T must implement <see cref="IToolForm"/>) , if it does not exist it will be created, if it is already open, it will be focused
-		/// </summary>
-		/// <typeparam name="T">Type of tool you want to load</typeparam>
 		/// <param name="toolPath">Path to the .dll of the external tool</param>
-		/// <param name="focus">Define if the tool form has to get the focus or not (Default is true)</param>
+		/// <typeparam name="T">Type of tool you want to load</typeparam>
 		/// <returns>An instantiated <see cref="IToolForm"/></returns>
-		public T Load<T>(string toolPath, bool focus = true)
+		public T Load<T>(bool focus = true, string toolPath = "")
 			where T : class, IToolForm
 		{
 			if (!IsAvailable<T>()) return null;
@@ -123,8 +111,7 @@ namespace BizHawk.Client.EmuHawk
 				_tools.Remove(existingTool);
 			}
 
-			var newTool = CreateInstance<T>(toolPath);
-			if (newTool == null) return null;
+			if (!(CreateInstance<T>(toolPath) is T newTool)) return null;
 
 			if (newTool is Form form) form.Owner = _owner;
 			ServiceInjector.UpdateServices(_emulator.ServiceProvider, newTool);
@@ -153,7 +140,7 @@ namespace BizHawk.Client.EmuHawk
 
 			newTool.Restart();
 			newTool.Show();
-			return (T)newTool;
+			return newTool;
 		}
 
 		/// <summary>Loads the external tool's entry form.</summary>