ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent some NREs occurring with the new Lua stuff

This commit is contained in:
CasualPokePlayer 2022-12-01 14:58:42 -08:00
parent 999e487557
commit 2efae13af4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/lua/LuaFile.cs
View File

@ -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)
}

6
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -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();
}