From a7197b348eaad4d3a74a482a5604d39b2e4b2977 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 8 Apr 2018 01:48:47 -0500
Subject: [PATCH] fix bug where autodump (and maybe lua-instructed client
 exits) would vanish the window but linger the process

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

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 810dfb3567..ba02157085 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -695,12 +695,12 @@ namespace BizHawk.Client.EmuHawk
 
 		public void CloseEmulator()
 		{
-			_exit = true;
+			_exitRequestPending = true;
 		}
 
 		public void CloseEmulator(int exitCode)
 		{
-			_exit = true;
+			_exitRequestPending = true;
 			_exitCode = exitCode;
 		}
 
@@ -2947,7 +2947,7 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void OnClosed(EventArgs e)
 		{
-			_exit = true;
+			_windowClosedAndSafeToExitProcess = true;
 			base.OnClosed(e);
 		}
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 3f7a9ea1df..79ff357164 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -493,7 +493,7 @@ namespace BizHawk.Client.EmuHawk
 					Close();
 				}
 
-				if (_exit)
+				if (_windowClosedAndSafeToExitProcess)
 				{
 					break;
 				}
@@ -1370,7 +1370,7 @@ namespace BizHawk.Client.EmuHawk
 		private int _avwriterResizeh;
 		private bool _avwriterpad;
 
-		private bool _exit;
+		private bool _windowClosedAndSafeToExitProcess;
 		private int _exitCode;
 		private bool _exitRequestPending;
 		private bool _runloopFrameProgress;
@@ -3427,7 +3427,7 @@ namespace BizHawk.Client.EmuHawk
 						StopAv();
 						if (argParse._autoCloseOnDump)
 						{
-							_exit = true;
+							_exitRequestPending = true;
 						}
 					}
 				}