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

lua: fix #1119

This commit is contained in:
feos 2018-03-09 13:35:10 +03:00
parent 1cd82aa5d9
commit 7fedbac9c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2985,7 +2985,7 @@ namespace BizHawk.Client.EmuHawk
if (IsTurboing)
{
GlobalWin.Tools.FastUpdateAfter();
GlobalWin.Tools.FastUpdateAfter(SuppressLua);
}
else
{

4
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -694,9 +694,9 @@ namespace BizHawk.Client.EmuHawk
}
}
public void FastUpdateAfter()
public void FastUpdateAfter(bool fromLua = false)
{
if (Global.Config.RunLuaDuringTurbo && Has<LuaConsole>())
if (!fromLua && Global.Config.RunLuaDuringTurbo && Has<LuaConsole>())
{
LuaConsole.ResumeScripts(true);
}