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

fix Broken Jump List #1015

This commit is contained in:
zeromus 2017-10-03 15:26:36 -05:00
parent 148cadda72
commit 74d1eba368
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/ArgParser.cs
View File

@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
cmdRom = arg; cmdRom = args[i];
} }
} }
} }

9
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -274,7 +274,8 @@ namespace BizHawk.Client.EmuHawk
if (argParse.cmdRom != null) if (argParse.cmdRom != null)
{ {
// Commandline should always override auto-load // Commandline should always override auto-load
LoadRom(argParse.cmdRom, new LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom() }); var ioa = OpenAdvancedSerializer.ParseWithLegacy(argParse.cmdRom);
LoadRom(argParse.cmdRom, new LoadRomArgs { OpenAdvanced = ioa });
if (Global.Game == null) if (Global.Game == null)
{ {
MessageBox.Show("Failed to load " + argParse.cmdRom + " specified on commandline"); MessageBox.Show("Failed to load " + argParse.cmdRom + " specified on commandline");
@ -3582,6 +3583,12 @@ namespace BizHawk.Client.EmuHawk
} }
} }
if (ioa is OpenAdvanced_OpenRom)
{
var ioa_openrom = (OpenAdvanced_OpenRom)ioa;
path = ioa_openrom.Path;
}
CoreFileProvider.SyncCoreCommInputSignals(nextComm); CoreFileProvider.SyncCoreCommInputSignals(nextComm);
var result = loader.LoadRom(path, nextComm); var result = loader.LoadRom(path, nextComm);