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

Don't need this anymore 

no idea when that happened sorry
This commit is contained in:
YoshiRulz 2020-07-25 08:30:15 +10:00
parent b0c76f28ca
commit 0fc3ac2105
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1207,17 +1207,7 @@ namespace BizHawk.Client.EmuHawk
Tools.LoadRamWatch(true); Tools.LoadRamWatch(true);
} }
private void RamSearchMenuItem_Click(object sender, EventArgs e) private void RamSearchMenuItem_Click(object sender, EventArgs e) => Tools.Load<RamSearch>();
{
var ramSearch = Tools.Load<RamSearch>();
if (OSTailoredCode.IsUnixHost)
{
// this is apparently needed for weird mono-forms-on-different-thread issues
// don't do .Show() within Load<T>() for RamSearch - instead put an instance of it here on MainForm, then show here
// the mono winforms implementation is.... weird and buggy
ramSearch.Show();
}
}
private void LuaConsoleMenuItem_Click(object sender, EventArgs e) private void LuaConsoleMenuItem_Click(object sender, EventArgs e)
{ {

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

@ -9,7 +9,6 @@ using System.ComponentModel;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common;
using BizHawk.Common.ReflectionExtensions; using BizHawk.Common.ReflectionExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.WinForms.Controls; using BizHawk.WinForms.Controls;
@ -153,14 +152,7 @@ namespace BizHawk.Client.EmuHawk
} }
newTool.Restart(); newTool.Restart();
if (OSTailoredCode.IsUnixHost && newTool is RamSearch) newTool.Show();
{
// the mono winforms implementation is buggy, skip to the return statement and call Show in MainForm instead
}
else
{
newTool.Show();
}
return (T)newTool; return (T)newTool;
} }