From 7fedbac9c3ee7d1a21b1eac2080ee8a838d41cb8 Mon Sep 17 00:00:00 2001 From: feos Date: Fri, 9 Mar 2018 13:35:10 +0300 Subject: [PATCH] lua: fix #1119 --- BizHawk.Client.EmuHawk/MainForm.cs | 2 +- BizHawk.Client.EmuHawk/tools/ToolManager.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 78817fbbf2..a696112c45 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2985,7 +2985,7 @@ namespace BizHawk.Client.EmuHawk if (IsTurboing) { - GlobalWin.Tools.FastUpdateAfter(); + GlobalWin.Tools.FastUpdateAfter(SuppressLua); } else { diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index bd5e0c9bdd..1a95aba1fe 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -694,9 +694,9 @@ namespace BizHawk.Client.EmuHawk } } - public void FastUpdateAfter() + public void FastUpdateAfter(bool fromLua = false) { - if (Global.Config.RunLuaDuringTurbo && Has()) + if (!fromLua && Global.Config.RunLuaDuringTurbo && Has()) { LuaConsole.ResumeScripts(true); }