From bba2e254d30ae3587c152a9b2851abe1143d432e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 6 Apr 2014 21:34:20 +0000
Subject: [PATCH] Fix an inconsistency between the Reboot core menu item and
 the reboot core hotkey

---
 BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 5 +----
 BizHawk.Client.EmuHawk/MainForm.cs        | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 4d995e805e..0c6c8c5470 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -89,10 +89,7 @@ namespace BizHawk.Client.EmuHawk
 					DecreaseSpeed();
 					break;
 				case "Reboot Core":
-					bool autoSaveState = Global.Config.AutoSavestates;
-					Global.Config.AutoSavestates = false;
-					LoadRom(CurrentlyOpenRom);
-					Global.Config.AutoSavestates = autoSaveState;
+					RebootCore();
 					break;
 
 				// Save States
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index f4c226f9ac..1ac23e2674 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -630,7 +630,10 @@ namespace BizHawk.Client.EmuHawk
 
 		public void RebootCore()
 		{
+			bool autoSaveState = Global.Config.AutoSavestates;
+			Global.Config.AutoSavestates = false;
 			LoadRom(CurrentlyOpenRom);
+			Global.Config.AutoSavestates = autoSaveState;
 		}
 
 		public void PauseEmulator()