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

Lua console - add newline on message to the console, better handling of attempting to load a script that already exists and has syntax errors

This commit is contained in:
adelikat 2019-12-03 20:42:44 -06:00
parent 56bacf3032
commit 53c12ec9d9
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -279,7 +279,25 @@ namespace BizHawk.Client.EmuHawk
{
var processedPath = PathManager.TryMakeRelative(path);
if (LuaAlreadyInSession(processedPath) == false)
var alreadyInSession = LuaImp.ScriptList.Any(t => processedPath == t.Path);
if (alreadyInSession)
{
foreach (var file in LuaImp.ScriptList
.Where(file => processedPath == file.Path
&& file.Enabled == false
&& !Global.Config.DisableLuaScriptsOnLoad))
{
if (file.Thread != null)
{
file.Toggle();
}
break;
}
RunLuaScripts();
}
else
{
var luaFile = new LuaFile("", processedPath);
@ -302,16 +320,6 @@ namespace BizHawk.Client.EmuHawk
CreateFileWatcher(processedPath);
}
}
else
{
foreach (var file in LuaImp.ScriptList.Where(file => processedPath == file.Path && file.Enabled == false && !Global.Config.DisableLuaScriptsOnLoad))
{
file.Toggle();
break;
}
RunLuaScripts();
}
UpdateDialog();
}
@ -454,11 +462,6 @@ namespace BizHawk.Client.EmuHawk
NumberOfScripts.Text = message;
}
private bool LuaAlreadyInSession(string path)
{
return LuaImp.ScriptList.Any(t => path == t.Path);
}
private int _messageCount;
private const int MaxCount = 50;
public void WriteToOutputWindow(string message)
@ -474,10 +477,9 @@ namespace BizHawk.Client.EmuHawk
if (_messageCount <= MaxCount)
{
OutputBox.Text += message;
OutputBox.Text += message + "\n";
OutputBox.SelectionStart = OutputBox.Text.Length;
OutputBox.ScrollToCaret();
}
});
}