From 078852567aba1d0dda6b0da9e3c6c37209295525 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 30 Sep 2021 19:43:38 +1000 Subject: [PATCH] Revert "Disable Tool Box on Linux (fixes #2741)" This reverts commit fe6bf7ba126a8e2635876def42eea0f955a83f8b. --- 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, 1 insertion(+), 15 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index db45e3089a..b545e45689 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -1,7 +1,5 @@ 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; @@ -351,7 +349,7 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); break; case "ToolBox": - if (!OSTailoredCode.IsUnixHost) Tools.Load(); + 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 73b7b7016e..339e6f00b8 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -354,12 +354,6 @@ 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 64684e61d6..fceef06a9d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -25,11 +25,6 @@ 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 @@ -38,7 +33,6 @@ namespace BizHawk.Client.EmuHawk public override void Restart() { - if (OSTailoredCode.IsUnixHost) return; SetTools(); SetSize();