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

Issue 288: Fix two crashes in single instance mode.

This commit is contained in:
jdpurcell 2014-12-29 04:20:47 +00:00
parent 19bdb01adc
commit 09c6072082
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.EmuHawk/Input/GamePad.cs
View File

@ -48,9 +48,12 @@ namespace BizHawk.Client.EmuHawk
public static void CloseAll() public static void CloseAll()
{ {
foreach (var device in Devices) if (Devices != null)
device.joystick.Dispose(); {
Devices.Clear(); foreach (var device in Devices)
device.joystick.Dispose();
Devices.Clear();
}
} }
// ********************************** Instance Members ********************************** // ********************************** Instance Members **********************************

3
BizHawk.Client.EmuHawk/Program.cs
View File

@ -273,7 +273,8 @@ REDO_DISPMETHOD:
void this_StartupNextInstance(object sender, StartupNextInstanceEventArgs e) void this_StartupNextInstance(object sender, StartupNextInstanceEventArgs e)
{ {
(MainForm as MainForm).LoadRom(e.CommandLine[0]); if (e.CommandLine.Count >= 1)
(MainForm as MainForm).LoadRom(e.CommandLine[0]);
} }
protected override void OnCreateMainForm() protected override void OnCreateMainForm()