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

Skip "run third-party code?" warning when using --open-ext-tool-dll

This commit is contained in:
YoshiRulz 2020-08-28 04:45:18 +10:00
parent 57acee9bd5
commit 08e24c96a7
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -166,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
var found = enabled.First(tuple => tuple.Item1 == requestedExtToolDll
|| Path.GetFileName(tuple.Item1) == requestedExtToolDll
|| Path.GetFileNameWithoutExtension(tuple.Item1) == requestedExtToolDll);
Tools.LoadExternalToolForm(found.Item1, found.Item2);
Tools.LoadExternalToolForm(found.Item1, found.Item2, skipExtToolWarning: true);
}
catch (Exception)
{

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

@ -144,7 +144,7 @@ namespace BizHawk.Client.EmuHawk
}
/// <summary>Loads the external tool's entry form.</summary>
public IExternalToolForm LoadExternalToolForm(string toolPath, string customFormTypeName, bool focus = true)
public IExternalToolForm LoadExternalToolForm(string toolPath, string customFormTypeName, bool focus = true, bool skipExtToolWarning = false)
{
var existingTool = _tools.OfType<IExternalToolForm>().FirstOrDefault(t => t.GetType().Assembly.Location == toolPath);
if (existingTool != null)
@ -161,7 +161,7 @@ namespace BizHawk.Client.EmuHawk
_tools.Remove(existingTool);
}
var newTool = (IExternalToolForm) CreateInstance(typeof(IExternalToolForm), toolPath, customFormTypeName);
var newTool = (IExternalToolForm) CreateInstance(typeof(IExternalToolForm), toolPath, customFormTypeName, skipExtToolWarning: skipExtToolWarning);
if (newTool == null) return null;
if (newTool is Form form) form.Owner = _owner;
ApiInjector.UpdateApis(_apiProvider, newTool);
@ -603,7 +603,7 @@ namespace BizHawk.Client.EmuHawk
/// <param name="dllPath">Path dll for an external tool</param>
/// <param name="toolTypeName">For external tools, <see cref="Type.FullName"/> of the entry form's type (<paramref name="toolType"/> will be <see cref="IExternalToolForm"/>)</param>
/// <returns>New instance of an IToolForm</returns>
private IToolForm CreateInstance(Type toolType, string dllPath, string toolTypeName = null)
private IToolForm CreateInstance(Type toolType, string dllPath, string toolTypeName = null, bool skipExtToolWarning = false)
{
IToolForm tool;
@ -612,7 +612,7 @@ namespace BizHawk.Client.EmuHawk
// Hard stuff as we need a proxy object that inherit from MarshalByRefObject.
if (toolType == typeof(IExternalToolForm))
{
if (MessageBox.Show(
if (skipExtToolWarning || MessageBox.Show(
"Are you sure want to load this external tool?\r\nAccept ONLY if you trust the source and if you know what you're doing. In any other case, choose no.",
"Confirm loading", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{