From ad41019a2979805919bbf12054b435a8bdae10dc Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 6 Dec 2016 10:44:37 -0600
Subject: [PATCH] ToolBox use an IEmulator RequiredService instead of
 Global.Emulator

---
 BizHawk.Client.EmuHawk/tools/ToolBox.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 7a4912dc0c..e20df010ad 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -12,6 +12,9 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class ToolBox : Form, IToolForm
 	{
+		[RequiredService]
+		private IEmulator Emulator { get; set; }
+
 		public ToolBox()
 		{
 			InitializeComponent();
@@ -61,7 +64,7 @@ namespace BizHawk.Client.EmuHawk
 					continue;
 				if (t == typeof(GBGameGenie)) // Hack, this tool is specific to a system id and a sub-system (gb and gg) we have no reasonable way to declare a dependency like that
 					continue;
-				if (!ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, t))
+				if (!ServiceInjector.IsAvailable(Emulator.ServiceProvider, t))
 					continue;
 
 				var instance = Activator.CreateInstance(t);