diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 3ceb7ebfe2..88b0b3faa6 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -531,7 +531,9 @@
Component
-
+
+ Component
+
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
index 01e8422fa5..8576c7d584 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
@@ -606,7 +606,7 @@ namespace BizHawk.Client.EmuHawk
}
var font = new Font(GlobalWin.DisplayManager.CustomFonts.Families[index], 8, FontStyle.Regular, GraphicsUnit.Pixel);
Size sizeOfText = g.MeasureString(message, font, 0, StringFormat.GenericTypographic).ToSize();
- Rectangle rect = new Rectangle(new Point(x, y), sizeOfText);
+ Rectangle rect = new Rectangle(new Point(x, y - 1), sizeOfText + new Size(1, 2));
g.FillRectangle(GetBrush(backcolor ?? DefaultTextBackground.Value), rect);
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
g.DrawString(message, font, GetBrush(forecolor ?? DefaultForeground), x, y);
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 7c4b056c77..a46dc789af 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -97,11 +97,15 @@ namespace BizHawk.Client.EmuHawk
private void LuaConsole_Load(object sender, EventArgs e)
{
- if (Global.Config.RecentLuaSession.AutoLoad)
+ if (Global.Config.RecentLuaSession.AutoLoad && !Global.Config.RecentLuaSession.Empty)
{
- if (!Global.Config.RecentLuaSession.Empty)
- {
LoadSessionFromRecent(Global.Config.RecentLuaSession[0]);
+ }
+ else if (Global.Config.RecentLua.AutoLoad)
+ {
+ if (!Global.Config.RecentLua.Empty)
+ {
+ LoadLuaFromRecent(Global.Config.RecentLua[0]);
}
}
}
@@ -619,7 +623,7 @@ namespace BizHawk.Client.EmuHawk
{
RecentScriptsSubMenu.DropDownItems.Clear();
RecentScriptsSubMenu.DropDownItems.AddRange(
- Global.Config.RecentLua.RecentMenu(LoadLuaFromRecent));
+ Global.Config.RecentLua.RecentMenu(LoadLuaFromRecent, true));
}
private void NewSessionMenuItem_Click(object sender, EventArgs e)