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

Lua - ResumeScripts - loop through only running scripts, to avoid sandbox calls for non-running scripts

This commit is contained in:
adelikat 2016-01-31 14:31:29 -05:00
parent 51e12040d1
commit 0ff2db5c8d
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -450,36 +450,33 @@ namespace BizHawk.Client.EmuHawk
LuaImp.GuiLibrary.DrawNew("emu");
}
foreach (var lf in _luaList)
foreach (var lf in _luaList.Where(l => l.Enabled && l.Thread != null && !l.Paused))
{
try
{
LuaSandbox.Sandbox(() =>
{
if (lf.Enabled && lf.Thread != null && !lf.Paused)
var prohibit = lf.FrameWaiting && !includeFrameWaiters;
if (!prohibit)
{
var prohibit = lf.FrameWaiting && !includeFrameWaiters;
if (!prohibit)
// Restore this lua thread's preferred current directory
if (lf.CurrentDirectory != null)
{
// Restore this lua thread's preferred current directory
if (lf.CurrentDirectory != null)
{
Environment.CurrentDirectory = PathManager.MakeAbsolutePath(lf.CurrentDirectory, null);
}
var result = LuaImp.ResumeScript(lf.Thread);
if (result.Terminated)
{
LuaImp.CallExitEvent(lf.Thread);
lf.Stop();
UpdateDialog();
}
lf.FrameWaiting = result.WaitForFrame;
// If the lua thread changed its current directory, capture that here
lf.CurrentDirectory = Environment.CurrentDirectory;
Environment.CurrentDirectory = PathManager.MakeAbsolutePath(lf.CurrentDirectory, null);
}
var result = LuaImp.ResumeScript(lf.Thread);
if (result.Terminated)
{
LuaImp.CallExitEvent(lf.Thread);
lf.Stop();
UpdateDialog();
}
lf.FrameWaiting = result.WaitForFrame;
// If the lua thread changed its current directory, capture that here
lf.CurrentDirectory = Environment.CurrentDirectory;
}
}, () =>
{