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

work around crash in clientapi when loading pce nyma

This commit is contained in:
nattthebear 2020-05-27 07:52:53 -04:00
parent b0620ca79d
commit 59a67329c7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BizHawk.Client.EmuHawk/Api/ClientApi.cs
View File

@ -112,7 +112,8 @@ namespace BizHawk.Client.EmuHawk
/// <exception cref="IndexOutOfRangeException">Raised when you specify a player less than 1 or greater than maximum allows (see SystemInfo class to get this information)</exception>
public static Joypad GetInput(int player)
{
if (!1.RangeTo(RunningSystem.MaxControllers).Contains(player)) throw new IndexOutOfRangeException($"{RunningSystem.DisplayName} does not support {player} controller(s)");
if (!1.RangeTo(RunningSystem.MaxControllers).Contains(player))
throw new IndexOutOfRangeException($"{RunningSystem.DisplayName} does not support {player} controller(s)");
GetAllInputs();
return _allJoyPads[player - 1];
}
@ -184,9 +185,17 @@ namespace BizHawk.Client.EmuHawk
VideoProvider = emu.AsVideoProviderOrDefault();
RomLoaded?.Invoke(null, EventArgs.Empty);
// TODO: Don't crash
// _allJoyPads = new List<Joypad>(RunningSystem.MaxControllers);
// for (var i = 1; i <= RunningSystem.MaxControllers; i++) _allJoyPads.Add(new Joypad(RunningSystem, i));
try
{
_allJoyPads = new List<Joypad>(RunningSystem.MaxControllers);
for (var i = 1; i <= RunningSystem.MaxControllers; i++)
_allJoyPads.Add(new Joypad(RunningSystem, i));
}
catch (Exception e)
{
Console.Error.WriteLine("Apihawk is garbage and may not work this session.");
Console.Error.WriteLine(e);
}
}
/// <summary>