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

Change remaining `Config.DisableLuaScriptsOnLoad` refs to Settings 

Resolve inconsistent use of duplicate property on `Config` and `LuaConsoleSettings`, finishes partial refactoring from 324a50a

This will effectively reset this setting to default in existing configs.
This commit is contained in:
kalimag 2022-11-27 19:53:29 +01:00 committed by James Groom
parent a8e0192281
commit 14e713837b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/config/Config.cs
View File

@ -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;

8
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -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)