From 98827aee47a98ccbad0b3eb2ccf2f84cad8e6e31 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 31 May 2020 10:53:58 -0500 Subject: [PATCH] Lua console - use the LoadLuaSession() method consistently instead of copy pasta --- .../tools/Lua/LuaConsole.cs | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index a33c0bd213..82ec4df058 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -666,16 +666,10 @@ namespace BizHawk.Client.EmuHawk if (load) { - if (!LuaImp.ScriptList.LoadLuaSession(path, Settings.DisableLuaScriptsOnLoad)) + if (!LoadLuaSession(path)) { Config.RecentLuaSession.HandleLoadError(path); } - else - { - RunLuaScripts(); - UpdateDialog(); - LuaImp.ScriptList.Changes = false; - } } AddFileWatches(); @@ -772,10 +766,7 @@ namespace BizHawk.Client.EmuHawk var result = ofd.ShowHawkDialog(); if (result == DialogResult.OK && !string.IsNullOrWhiteSpace(ofd.FileName)) { - LuaImp.ScriptList.LoadLuaSession(ofd.FileName, Settings.DisableLuaScriptsOnLoad); - RunLuaScripts(); - UpdateDialog(); - LuaImp.ScriptList.Changes = false; + LoadLuaSession(ofd.FileName); } } @@ -1303,10 +1294,7 @@ namespace BizHawk.Client.EmuHawk } else if (Path.GetExtension(path)?.ToLower() == ".luases") { - LuaImp.ScriptList.LoadLuaSession(path, Settings.DisableLuaScriptsOnLoad); - RunLuaScripts(); - UpdateDialog(); - LuaImp.ScriptList.Changes = false; + LoadLuaSession(path); return; } }