From 74d1eba3689d118f4359a37fde2489ebe6267b24 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Tue, 3 Oct 2017 15:26:36 -0500
Subject: [PATCH] fix Broken Jump List #1015

---
 BizHawk.Client.EmuHawk/ArgParser.cs | 2 +-
 BizHawk.Client.EmuHawk/MainForm.cs  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/ArgParser.cs b/BizHawk.Client.EmuHawk/ArgParser.cs
index 939ca94b29..9e4c5ab1b9 100644
--- a/BizHawk.Client.EmuHawk/ArgParser.cs
+++ b/BizHawk.Client.EmuHawk/ArgParser.cs
@@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					cmdRom = arg;
+					cmdRom = args[i];
 				}
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 930474edc4..7929f31a90 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -274,7 +274,8 @@ namespace BizHawk.Client.EmuHawk
 			if (argParse.cmdRom != null)
 			{
 				// 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)
 				{
 					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);
 				var result = loader.LoadRom(path, nextComm);