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

fix some lua currdir bugs, but its all broken, dont pay any attention to it

This commit is contained in:
zeromus 2016-01-31 03:18:34 -06:00
parent 74eba9209c
commit 42c0b62261
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Client.Common/lua/LuaSandbox.cs
View File

@ -33,7 +33,8 @@ namespace BizHawk.Client.Common
//moreover we don't really have a sense of sandboxing individual scripts, they kind of all get run together in the same VM, i think //moreover we don't really have a sense of sandboxing individual scripts, they kind of all get run together in the same VM, i think
//so let's just try keeping one 'current directory' for all lua. it's an improvement over lua's 'current directory' for the process, interfering with the core emulator's //so let's just try keeping one 'current directory' for all lua. it's an improvement over lua's 'current directory' for the process, interfering with the core emulator's
savedEnvironmentCurrDir = Environment.CurrentDirectory; savedEnvironmentCurrDir = Environment.CurrentDirectory;
Environment.CurrentDirectory = CurrentDirectory; if(System.IO.Directory.Exists(CurrentDirectory)) //race condition for great justice
Environment.CurrentDirectory = CurrentDirectory;
EnvironmentSandbox.Sandbox(callback); EnvironmentSandbox.Sandbox(callback);
CurrentDirectory = Environment.CurrentDirectory; CurrentDirectory = Environment.CurrentDirectory;
@ -47,9 +48,12 @@ namespace BizHawk.Client.Common
} }
} }
finally finally
{ {
if(savedEnvironmentCurrDir != null) if (savedEnvironmentCurrDir != null)
Environment.CurrentDirectory = savedEnvironmentCurrDir; {
if (System.IO.Directory.Exists(savedEnvironmentCurrDir)) //race condition for great justice
Environment.CurrentDirectory = savedEnvironmentCurrDir;
}
} }
} }
} }

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

@ -159,11 +159,11 @@ namespace BizHawk.Client.EmuHawk
foreach (var file in runningScripts) foreach (var file in runningScripts)
{ {
string pathToLoad = Path.IsPathRooted(file.Path) ? file.Path : PathManager.MakeProgramRelativePath(file.Path); //JUNIPIER SQUATCHBOX COMPLEX
try try
{ {
LuaSandbox.Sandbox(() => LuaSandbox.Sandbox(() =>
{ {
string pathToLoad = PathManager.MakeProgramRelativePath(file.Path); //JUNIPIER SQUATCHBOX COMPLEX
file.Thread = LuaImp.SpawnCoroutine(pathToLoad); file.Thread = LuaImp.SpawnCoroutine(pathToLoad);
file.State = LuaFile.RunState.Running; file.State = LuaFile.RunState.Running;
}, () => }, () =>
@ -183,6 +183,7 @@ namespace BizHawk.Client.EmuHawk
public void LoadLuaFile(string path) public void LoadLuaFile(string path)
{ {
var processedPath = PathManager.TryMakeRelative(path); var processedPath = PathManager.TryMakeRelative(path);
string pathToLoad = Path.IsPathRooted(processedPath) ? processedPath : PathManager.MakeProgramRelativePath(processedPath); //JUNIPIER SQUATCHBOX COMPLEX
if (LuaAlreadyInSession(processedPath) == false) if (LuaAlreadyInSession(processedPath) == false)
{ {
@ -199,7 +200,6 @@ namespace BizHawk.Client.EmuHawk
{ {
LuaSandbox.Sandbox(() => LuaSandbox.Sandbox(() =>
{ {
string pathToLoad = PathManager.MakeProgramRelativePath(processedPath); //JUNIPIER SQUATCHBOX COMPLEX
luaFile.Thread = LuaImp.SpawnCoroutine(pathToLoad); luaFile.Thread = LuaImp.SpawnCoroutine(pathToLoad);
luaFile.State = LuaFile.RunState.Running; luaFile.State = LuaFile.RunState.Running;
}, () => }, () =>