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

View File

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

View File

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