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

Refactor disabling Lua script into separate method

This commit is contained in:
kalimag 2022-11-27 19:54:04 +01:00 committed by James Groom
parent 7c7ac64ae6
commit 3a70fb65f8
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,9 +203,7 @@ namespace BizHawk.Client.EmuHawk
// we don't use runningScripts here as the other scripts need to be stopped too // we don't use runningScripts here as the other scripts need to be stopped too
foreach (var file in luaLibsImpl.ScriptList) foreach (var file in luaLibsImpl.ScriptList)
{ {
if (file.Enabled) luaLibsImpl.CallExitEvent(file); DisableLuaScript(file);
luaLibsImpl.RegisteredFunctions.RemoveForFile(file, Emulator);
file.Stop();
} }
} }
@ -1508,12 +1506,25 @@ namespace BizHawk.Client.EmuHawk
EnableLuaFile(file); EnableLuaFile(file);
} }
else if (!file.Enabled && file.Thread is not null) else if (!file.Enabled && file.Thread is not null)
{
DisableLuaScript(file);
// there used to be a call here which did a redraw of the Gui/OSD, which included a call to `Tools.UpdateToolsAfter` --yoshi
}
}
private void DisableLuaScript(LuaFile file)
{
if (LuaImp is not Win32LuaLibraries luaLibsImpl) return;
if (file.IsSeparator) return;
file.State = LuaFile.RunState.Disabled;
if (file.Thread is not null)
{ {
luaLibsImpl.CallExitEvent(file); luaLibsImpl.CallExitEvent(file);
luaLibsImpl.RegisteredFunctions.RemoveForFile(file, Emulator); luaLibsImpl.RegisteredFunctions.RemoveForFile(file, Emulator);
luaLibsImpl.CallExitEvent(file);
file.Stop(); file.Stop();
// there used to be a call here which did a redraw of the Gui/OSD, which included a call to `Tools.UpdateToolsAfter` --yoshi
} }
} }