From 2efae13af4f9dd5ca233a31b9085195829f6a513 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:58:42 -0800
Subject: [PATCH] prevent some NREs occurring with the new Lua stuff

---
 src/BizHawk.Client.Common/lua/LuaFile.cs           | 2 +-
 src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/BizHawk.Client.Common/lua/LuaFile.cs b/src/BizHawk.Client.Common/lua/LuaFile.cs
index 93730097e5..d5c2d25d04 100644
--- a/src/BizHawk.Client.Common/lua/LuaFile.cs
+++ b/src/BizHawk.Client.Common/lua/LuaFile.cs
@@ -56,7 +56,7 @@ namespace BizHawk.Client.Common
 				return;
 			}
 
-			if (Thread.State.Status == KeraLua.LuaStatus.OK)
+			if (State == RunState.Running && Thread.State.Status == KeraLua.LuaStatus.OK)
 			{
 				Thread.State.Yield(0); // we MUST yield this thread, else old references to lua libs might be used (and those may contain references to a Dispose()'d emulator)
 			}
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index acb7eeaa26..3f8b5ad79c 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -209,11 +209,9 @@ namespace BizHawk.Client.EmuHawk
 					return;
 				}
 
-				runningScripts = luaLibsImpl.ScriptList.Where(lf => lf.Enabled).ToList();
-
-				foreach (var file in runningScripts)
+				foreach (var file in luaLibsImpl.ScriptList)
 				{
-					luaLibsImpl.CallExitEvent(file);
+					if (file.Enabled) luaLibsImpl.CallExitEvent(file);
 					luaLibsImpl.RegisteredFunctions.RemoveForFile(file, Emulator);
 					file.Stop();
 				}