From 56442d9f8d57ca6d7d9d3a7c42d11a67f548022e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 21 Sep 2014 14:58:03 +0000
Subject: [PATCH] Fix ToolManager Has<T> function to check if a tool is
 disposed not just if it is in the tool list

---
 BizHawk.Client.EmuHawk/tools/ToolManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 60923cc3c2..109b6602c1 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		public bool Has<T>() where T : IToolForm
 		{
-			return _tools.Any(x => x is T);
+			return _tools.Any(x => x is T && !x.IsDisposed);
 		}
 
 		/// <summary>