ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
adelikat 2012-03-03 18:24:34 +00:00
parent 3bfe716952
commit e3b3879954
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.MultiClient/MainForm.cs
View File

@ -753,13 +753,10 @@ namespace BizHawk.MultiClient
else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0]))) else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
{ {
if (CurrentlyOpenRom == null) if (CurrentlyOpenRom == null)
{
OpenROM(); OpenROM();
if (CurrentlyOpenRom == null)
return;
}
else else
LoadRom(CurrentlyOpenRom); LoadRom(CurrentlyOpenRom);
string errorMsg = ""; string errorMsg = "";
string warningMsg = ""; string warningMsg = "";
Movie m = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg); Movie m = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);

5
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -172,6 +172,9 @@ namespace BizHawk.MultiClient
public string GetControllersAsMnemonic() public string GetControllersAsMnemonic()
{ {
if (Global.Emulator.SystemId == "NULL")
return "|.|";
StringBuilder input = new StringBuilder("|"); StringBuilder input = new StringBuilder("|");
if (ControlType == "Gameboy Controller") if (ControlType == "Gameboy Controller")
@ -374,6 +377,8 @@ namespace BizHawk.MultiClient
/// </summary> /// </summary>
public void SetControllersAsMnemonic(string mnemonic) public void SetControllersAsMnemonic(string mnemonic)
{ {
if (Global.Emulator.SystemId == "NULL")
return;
MnemonicChecker c = new MnemonicChecker(mnemonic); MnemonicChecker c = new MnemonicChecker(mnemonic);
MyBoolButtons.Clear(); MyBoolButtons.Clear();