diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 872b0f98bb..9bee3f6dc1 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -256,7 +256,6 @@ namespace BizHawk.Client.Common // Lua public RecentFiles RecentLua { get; set; } = new RecentFiles(8); public RecentFiles RecentLuaSession { get; set; } = new RecentFiles(8); - public bool DisableLuaScriptsOnLoad { get; set; } // luaconsole-refactor TODO: move this to LuaConsole settings public bool RunLuaDuringTurbo { get; set; } = true; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index fa537adadf..4ae5c36fbf 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -305,7 +305,7 @@ namespace BizHawk.Client.EmuHawk foreach (var file in luaLibsImpl.ScriptList .Where(file => processedPath == file.Path && file.Enabled == false - && !Config.DisableLuaScriptsOnLoad)) + && !Settings.DisableLuaScriptsOnLoad)) { if (file.Thread is not null) { @@ -325,7 +325,7 @@ namespace BizHawk.Client.EmuHawk LuaListView.RowCount = luaLibsImpl.ScriptList.Count; Config.RecentLua.Add(processedPath); - if (!Config.DisableLuaScriptsOnLoad) + if (!Settings.DisableLuaScriptsOnLoad) { luaFile.State = LuaFile.RunState.Running; EnableLuaFile(luaFile); @@ -1079,14 +1079,14 @@ namespace BizHawk.Client.EmuHawk private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { - DisableScriptsOnLoadMenuItem.Checked = Config.DisableLuaScriptsOnLoad; + DisableScriptsOnLoadMenuItem.Checked = Settings.DisableLuaScriptsOnLoad; ReturnAllIfNoneSelectedMenuItem.Checked = Settings.ToggleAllIfNoneSelected; ReloadWhenScriptFileChangesMenuItem.Checked = Settings.ReloadOnScriptFileChange; } private void DisableScriptsOnLoadMenuItem_Click(object sender, EventArgs e) { - Config.DisableLuaScriptsOnLoad ^= true; + Settings.DisableLuaScriptsOnLoad ^= true; } private void ToggleAllIfNoneSelectedMenuItem_Click(object sender, EventArgs e)