From 5906bf232bfd3a77cebf45bac35cf51547ef2e24 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sat, 17 Oct 2015 21:36:04 -0500
Subject: [PATCH] add --load-state to go along with --load-slot

---
 BizHawk.Client.EmuHawk/MainForm.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index a27cd866ec..80aa9fc415 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -144,6 +144,7 @@ namespace BizHawk.Client.EmuHawk
 			// TODO - replace this with some kind of standard dictionary-yielding parser in a separate component
 			string cmdRom = null;
 			string cmdLoadState = null;
+			string cmdLoadSlot = null;
 			string cmdMovie = null;
 			string cmdDumpType = null;
 			string cmdDumpName = null;
@@ -161,6 +162,10 @@ namespace BizHawk.Client.EmuHawk
 
 				var arg = args[i].ToLower();
 				if (arg.StartsWith("--load-slot="))
+				{
+					cmdLoadSlot = arg.Substring(arg.IndexOf('=') + 1);
+				}
+				if (arg.StartsWith("--load-state="))
 				{
 					cmdLoadState = arg.Substring(arg.IndexOf('=') + 1);
 				}
@@ -401,13 +406,20 @@ namespace BizHawk.Client.EmuHawk
 				ToggleFullscreen();
 			}
 
-			if (cmdLoadState != null && !Global.Game.IsNullInstance)
+			if(!Global.Game.IsNullInstance)
 			{
-				LoadQuickSave("QuickSave" + cmdLoadState);
-			}
-			else if (Global.Config.AutoLoadLastSaveSlot && !Global.Game.IsNullInstance)
-			{
-				LoadQuickSave("QuickSave" + Global.Config.SaveSlot);
+				if(cmdLoadState != null)
+				{
+					LoadState(cmdLoadState,Path.GetFileName(cmdLoadState));
+				}
+				else if (cmdLoadSlot != null)
+				{
+					LoadQuickSave("QuickSave" + cmdLoadSlot);
+				}
+				else if (Global.Config.AutoLoadLastSaveSlot)
+				{
+					LoadQuickSave("QuickSave" + Global.Config.SaveSlot);
+				}
 			}
 
 			GlobalWin.Tools.AutoLoad();