ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Tiny ToolManager.Load cleanup" 

This reverts commit 2d6bac8798.
This commit is contained in:
adelikat 2020-07-25 09:26:47 -05:00
parent 4a6b3e407a
commit 7c3ccd6646
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -87,11 +87,23 @@ namespace BizHawk.Client.EmuHawk
/// <summary> /// <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 /// 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> /// </summary>
/// <param name="focus">Define if the tool form has to get the focus or not (Default is true)</param>
/// <param name="toolPath">Path to the .dll of the external tool</param>
/// <typeparam name="T">Type of tool you want to load</typeparam> /// <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> /// <returns>An instantiated <see cref="IToolForm"/></returns>
public T Load<T>(bool focus = true, string toolPath = "") 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>
/// <returns>An instantiated <see cref="IToolForm"/></returns>
public T Load<T>(string toolPath, bool focus = true)
where T : class, IToolForm where T : class, IToolForm
{ {
if (!IsAvailable<T>()) return null; if (!IsAvailable<T>()) return null;
@ -111,7 +123,8 @@ namespace BizHawk.Client.EmuHawk
_tools.Remove(existingTool); _tools.Remove(existingTool);
} }
if (!(CreateInstance<T>(toolPath) is T newTool)) return null; var newTool = CreateInstance<T>(toolPath);
if (newTool == null) return null;
if (newTool is Form form) form.Owner = _owner; if (newTool is Form form) form.Owner = _owner;
ServiceInjector.UpdateServices(_emulator.ServiceProvider, newTool); ServiceInjector.UpdateServices(_emulator.ServiceProvider, newTool);
@ -140,7 +153,7 @@ namespace BizHawk.Client.EmuHawk
newTool.Restart(); newTool.Restart();
newTool.Show(); newTool.Show();
return newTool; return (T)newTool;
} }
/// <summary>Loads the external tool's entry form.</summary> /// <summary>Loads the external tool's entry form.</summary>