From a3b996e4e2afbb41b6fb07831613d4a46ad9f93b Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 8 May 2011 14:25:51 +0000
Subject: [PATCH] Define active controller whenever a new null emulator is
 created

---
 BizHawk.MultiClient/MainForm.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index c3bc85eb19..6b7b7f6548 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -100,6 +100,7 @@ namespace BizHawk.MultiClient
 			InitControls();
 			Global.Emulator = new NullEmulator();
             InputLog.StopMovie();
+            Global.ActiveController = Global.NullControls;
 			Global.Sound = new Sound(Handle, Global.DSound);
 			Global.Sound.StartSound();
 
@@ -696,6 +697,7 @@ namespace BizHawk.MultiClient
 			}
 			Global.Emulator = new NullEmulator();
             InputLog.StopMovie();
+            Global.ActiveController = Global.NullControls;
 		}
 
 		[System.Security.SuppressUnmanagedCodeSecurity, DllImport("User32.dll", CharSet = CharSet.Auto)]