From 45f7317b58f55318d847bb0d6e1ffc42cfaf6f6e Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 7 Oct 2014 01:20:48 +0000
Subject: [PATCH] add exit program hotkey

---
 BizHawk.Client.Common/config/Binding.cs   | 1 +
 BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs
index c4a5231912..4b88d00dd4 100644
--- a/BizHawk.Client.Common/config/Binding.cs
+++ b/BizHawk.Client.Common/config/Binding.cs
@@ -115,6 +115,7 @@ namespace BizHawk.Client.Common
 					new Binding { DisplayName = "Reboot Core", Bindings = "Ctrl+R", TabGroup = "General", DefaultBinding = "Ctrl+R", Ordinal = 30 },
 					new Binding { DisplayName = "Autofire", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 31 },
 					new Binding { DisplayName = "Toggle Sound", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 32 },
+					new Binding { DisplayName = "Exit Program", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 33 },
 
 					//Save States
 					new Binding { DisplayName = "Save State 0", Bindings = "Shift+F10", TabGroup = "Save States", DefaultBinding = "Shift+F10", Ordinal = 1 },
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 9d2367f03b..ac07af9028 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -74,6 +74,9 @@ namespace BizHawk.Client.EmuHawk
 				case "Toggle Sound":
 					ToggleSound();
 					break;
+				case "Exit Program":
+					_exit = true;
+					break;
 				case "Record A/V":
 					RecordAv();
 					break;