From e3b387995414ad1753b7147bc79a14a8c90cce0c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 3 Mar 2012 18:24:34 +0000
Subject: [PATCH] FIxed Get/Set mneomnics to not break on null emulator,
 refactored the drag and drop for movies to allow the user to continue if they
 decline to open a rom from the open rom pop up

---
 BizHawk.MultiClient/MainForm.cs            | 5 +----
 BizHawk.MultiClient/movie/InputAdapters.cs | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 6533d51638..48a909942a 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -753,13 +753,10 @@ namespace BizHawk.MultiClient
 			else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
 			{
 				if (CurrentlyOpenRom == null)
-				{
 					OpenROM();
-					if (CurrentlyOpenRom == null)
-						return;
-				}
 				else
 					LoadRom(CurrentlyOpenRom);
+
 				string errorMsg = "";
 				string warningMsg = "";
 				Movie m = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index 21137cfed7..ed6f7c4292 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -172,6 +172,9 @@ namespace BizHawk.MultiClient
 
 		public string GetControllersAsMnemonic()
 		{
+			if (Global.Emulator.SystemId == "NULL")
+				return "|.|";
+
 			StringBuilder input = new StringBuilder("|");
 
 			if (ControlType == "Gameboy Controller")
@@ -374,6 +377,8 @@ namespace BizHawk.MultiClient
 		/// </summary>
 		public void SetControllersAsMnemonic(string mnemonic)
 		{
+			if (Global.Emulator.SystemId == "NULL")
+				return;
 			MnemonicChecker c = new MnemonicChecker(mnemonic);
 
 			MyBoolButtons.Clear();