From f716caeae581679327ab1e0561e045bb32875aa0 Mon Sep 17 00:00:00 2001 From: brandman211 Date: Sat, 9 Jun 2012 02:24:19 +0000 Subject: [PATCH] Temporary fix for the ROM loading crash issue. Will report if it crashes again. --- BizHawk.MultiClient/movie/InputAdapters.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs index 1ac99de333..5d42252e3a 100644 --- a/BizHawk.MultiClient/movie/InputAdapters.cs +++ b/BizHawk.MultiClient/movie/InputAdapters.cs @@ -177,7 +177,7 @@ namespace BizHawk.MultiClient public string GetControllersAsMnemonic() { - if (Global.Emulator.SystemId == "NULL") + if (Global.Emulator.SystemId == "NULL" || ControlType == "NULL Controller") return "|.|"; StringBuilder input = new StringBuilder("|"); @@ -386,7 +386,7 @@ namespace BizHawk.MultiClient /// public void SetControllersAsMnemonic(string mnemonic) { - if (Global.Emulator.SystemId == "NULL") + if (Global.Emulator.SystemId == "NULL" || ControlType == "NULL Controller") return; MnemonicChecker c = new MnemonicChecker(mnemonic);