From fe6bf7ba126a8e2635876def42eea0f955a83f8b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 16 May 2021 08:55:33 +1000 Subject: [PATCH] Disable Tool Box on Linux (fixes #2741) Was going to Close() the instances made by ToolBox.SetTools, which is probably a good idea still, but it didn't cause my overridden LogWindow.OnClosing to run so I gave up. The Tool Box is dumb anyway. --- src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 4 +++- src/BizHawk.Client.EmuHawk/MainForm.cs | 6 ++++++ src/BizHawk.Client.EmuHawk/tools/ToolBox.cs | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index b545e45689..db45e3089a 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -1,5 +1,7 @@ using System; using System.Linq; + +using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS; using BizHawk.Emulation.Cores.Nintendo.Gameboy; @@ -349,7 +351,7 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); break; case "ToolBox": - Tools.Load(); + if (!OSTailoredCode.IsUnixHost) Tools.Load(); break; case "Virtual Pad": Tools.Load(); diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 178978466a..209596a8e4 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -349,6 +349,12 @@ namespace BizHawk.Client.EmuHawk #else SynclessRecordingMenuItem.Enabled = false; #endif + if (OSTailoredCode.IsUnixHost) + { + ToolBoxMenuItem.Enabled = false; + ToolBoxMenuItem.Visible = false; + toolStripSeparator12.Visible = false; + } Game = GameInfo.NullInstance; _throttle = new Throttle(); diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 68fa869ba9..15938d8f38 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -25,6 +25,11 @@ namespace BizHawk.Client.EmuHawk private void ToolBox_Load(object sender, EventArgs e) { + if (OSTailoredCode.IsUnixHost) + { + Close(); + return; + } Location = new Point( Owner.Location.X + Owner.Size.Width, Owner.Location.Y @@ -33,6 +38,7 @@ namespace BizHawk.Client.EmuHawk public override void Restart() { + if (OSTailoredCode.IsUnixHost) return; SetTools(); SetSize();