Revert "Disable Tool Box on Linux (fixes #2741)"

This reverts commit fe6bf7b.
TASEmulators · Sep 30, 2021 · 0788525 · 0788525
1 parent dc090b8
commit 0788525
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git 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 @@ private bool CheckHotkey(string trigger)
 					Tools.Load<TAStudio>();
 					break;
 				case "ToolBox":
-					if (!OSTailoredCode.IsUnixHost) Tools.Load<ToolBox>();
+					Tools.Load<ToolBox>();
 					break;
 				case "Virtual Pad":
 					Tools.Load<VirtualpadTool>();

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -354,12 +354,6 @@ void MainForm_MouseClick(object sender, MouseEventArgs e)
 #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
@@ -25,11 +25,6 @@ public ToolBox()
 
 		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 @@ private void ToolBox_Load(object sender, EventArgs e)
 
 		public override void Restart()
 		{
-			if (OSTailoredCode.IsUnixHost) return;
 			SetTools();
 			SetSize();