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

Lua Console - try to use relative paths when saving and loading lua scripts

This commit is contained in:
adelikat 2014-03-23 14:44:18 +00:00
parent 8b6bf3fc89
commit 8ac9f7d2dd
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/lua/LuaFileList.cs
View File

@ -138,7 +138,7 @@ namespace BizHawk.Client.Common
sb
.Append(file.Enabled ? "1" : "0")
.Append(' ')
.Append(file.Path)
.Append(PathManager.TryMakeRelative(file.Path))
.AppendLine();
}

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

@ -109,18 +109,20 @@ namespace BizHawk.Client.EmuHawk
public void LoadLuaFile(string path)
{
if (LuaAlreadyInSession(path) == false)
var processedPath = PathManager.TryMakeRelative(path);
if (LuaAlreadyInSession(processedPath) == false)
{
var luaFile = new LuaFile(string.Empty, path);
var luaFile = new LuaFile(string.Empty, processedPath);
_luaList.Add(luaFile);
LuaListView.ItemCount = _luaList.Count;
Global.Config.RecentLua.Add(path);
Global.Config.RecentLua.Add(processedPath);
if (!Global.Config.DisableLuaScriptsOnLoad)
{
try
{
luaFile.Thread = LuaImp.SpawnCoroutine(path);
luaFile.Thread = LuaImp.SpawnCoroutine(processedPath);
luaFile.Enabled = true;
}
catch (Exception e)
@ -145,7 +147,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
foreach (var file in _luaList.Where(file => path == file.Path && file.Enabled == false && !Global.Config.DisableLuaScriptsOnLoad))
foreach (var file in _luaList.Where(file => processedPath == file.Path && file.Enabled == false && !Global.Config.DisableLuaScriptsOnLoad))
{
file.Toggle();
break;
@ -234,10 +236,20 @@ namespace BizHawk.Client.EmuHawk
}
else if (column == 1)
{
text = _luaList[index].Path;
text = DressUpRelative(_luaList[index].Path);
}
}
private string DressUpRelative(string path)
{
if (path.StartsWith(".\\"))
{
return path.Replace(".\\", string.Empty);
}
return path;
}
private void SaveConfigSettings()
{
LuaImp.Close();