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

Lock/unlock Lua drawing surface for event callbacks (fixes #2595)

This commit is contained in:
YoshiRulz 2021-02-05 10:44:13 +10:00
parent 9d1eaa6475
commit 643d7b12dd
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
View File

@ -165,13 +165,16 @@ namespace BizHawk.Client.EmuHawk
{
try
{
GuiAPI.LockEmuSurfaceLua();
foreach (var lf in RegisteredFunctions.Where(l => l.Event == "OnSavestateSave"))
{
lf.Call(name);
}
GuiAPI.UnlockEmuSurfaceLua();
}
catch (Exception e)
{
GuiAPI.UnlockEmuSurfaceLua();
LogToLuaConsole($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
}
}
@ -180,13 +183,16 @@ namespace BizHawk.Client.EmuHawk
{
try
{
GuiAPI.LockEmuSurfaceLua();
foreach (var lf in RegisteredFunctions.Where(l => l.Event == "OnSavestateLoad"))
{
lf.Call(name);
}
GuiAPI.UnlockEmuSurfaceLua();
}
catch (Exception e)
{
GuiAPI.UnlockEmuSurfaceLua();
LogToLuaConsole($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
}
}
@ -196,13 +202,16 @@ namespace BizHawk.Client.EmuHawk
if (IsUpdateSupressed) return;
try
{
GuiAPI.LockEmuSurfaceLua();
foreach (var lf in RegisteredFunctions.Where(l => l.Event == "OnFrameStart"))
{
lf.Call();
}
GuiAPI.UnlockEmuSurfaceLua();
}
catch (Exception e)
{
GuiAPI.UnlockEmuSurfaceLua();
LogToLuaConsole($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
}
}
@ -212,23 +221,28 @@ namespace BizHawk.Client.EmuHawk
if (IsUpdateSupressed) return;
try
{
GuiAPI.LockEmuSurfaceLua();
foreach (var lf in RegisteredFunctions.Where(l => l.Event == "OnFrameEnd"))
{
lf.Call();
}
GuiAPI.UnlockEmuSurfaceLua();
}
catch (Exception e)
{
GuiAPI.UnlockEmuSurfaceLua();
LogToLuaConsole($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
}
}
public void CallExitEvent(LuaFile lf)
{
GuiAPI.LockEmuSurfaceLua();
foreach (var exitCallback in RegisteredFunctions.ForFile(lf).ForEvent("OnExit"))
{
exitCallback.Call();
}
GuiAPI.UnlockEmuSurfaceLua();
}
public void Close()