From 38ebdd45d2e6dce05385b425b9b792a3d4439904 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 12 Nov 2014 00:11:31 +0000
Subject: [PATCH] fix Issue #292 - Bizhawk still here after emulating N64 and
 "Exit key" has been pressed

---
 BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 2 +-
 BizHawk.Client.EmuHawk/MainForm.cs        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index ac07af9028..dff2b1c93b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
 					ToggleSound();
 					break;
 				case "Exit Program":
-					_exit = true;
+					_exitRequestPending = true;
 					break;
 				case "Record A/V":
 					RecordAv();
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index f360c0bc86..eccf3e7bc1 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -540,6 +540,13 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 				CheckMessages();
+
+				if (_exitRequestPending)
+				{
+					_exitRequestPending = false;
+					Close();
+				}
+
 				if (_exit)
 				{
 					break;
@@ -1225,6 +1232,7 @@ namespace BizHawk.Client.EmuHawk
 		private bool _avwriterpad;
 
 		private bool _exit;
+		private bool _exitRequestPending;
 		private bool _runloopFrameProgress;
 		private DateTime _frameAdvanceTimestamp = DateTime.MinValue;
 		private int _runloopFps;