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

Re-enable the Lua Console on Unix

This commit is contained in:
YoshiRulz 2019-10-19 15:31:58 +10:00
parent db020e499e
commit 881974b495
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,19 +59,22 @@ namespace BizHawk.Client.EmuHawk
if (AskSaveChanges())
{
SaveColumnInfo(LuaListView, Settings.Columns);
GlobalWin.DisplayManager.ClearLuaSurfaces();
if (GlobalWin.DisplayManager.ClientExtraPadding != Padding.Empty)
if (GlobalWin.DisplayManager != null)
{
GlobalWin.DisplayManager.ClientExtraPadding = new Padding(0);
GlobalWin.MainForm.FrameBufferResized();
}
GlobalWin.DisplayManager.ClearLuaSurfaces();
if (GlobalWin.DisplayManager.GameExtraPadding != Padding.Empty)
{
GlobalWin.DisplayManager.GameExtraPadding = new Padding(0);
GlobalWin.MainForm.FrameBufferResized();
if (GlobalWin.DisplayManager.ClientExtraPadding != Padding.Empty)
{
GlobalWin.DisplayManager.ClientExtraPadding = new Padding(0);
GlobalWin.MainForm.FrameBufferResized();
}
if (GlobalWin.DisplayManager.GameExtraPadding != Padding.Empty)
{
GlobalWin.DisplayManager.GameExtraPadding = new Padding(0);
GlobalWin.MainForm.FrameBufferResized();
}
}
LuaImp.GuiLibrary.DrawFinish();
@ -187,9 +190,7 @@ namespace BizHawk.Client.EmuHawk
}
var currentScripts = LuaImp?.ScriptList; // Temp fix for now
LuaImp = OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
? (PlatformEmuLuaLibrary)new EmuLuaLibrary(Emulator.ServiceProvider)
: (PlatformEmuLuaLibrary)new NotReallyLuaLibrary();
LuaImp = new EmuLuaLibrary(Emulator.ServiceProvider);
if (currentScripts != null)
{
LuaImp.ScriptList.AddRange(currentScripts);

2
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -748,8 +748,6 @@ namespace BizHawk.Client.EmuHawk
return false;
}
if (t == typeof(LuaConsole) && OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows) return false;
var tool = Assembly
.GetExecutingAssembly()
.GetTypes()