diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 834c9bd113..ff6ab4739e 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -590,6 +590,11 @@ namespace BizHawk.Client.EmuHawk } private void ExitMenuItem_Click(object sender, EventArgs e) + { + CloseEmulator(); + } + + public void CloseEmulator() { if (GlobalWin.Tools.AskSave()) { diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs index ceb3afa697..f49e72ba75 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs @@ -36,6 +36,15 @@ namespace BizHawk.Client.EmuHawk public override string Name { get { return "client"; } } + [LuaMethodAttributes( + "exit", + "Closes the emulator" + )] + public void CloseEmulator() + { + GlobalWin.MainForm.CloseEmulator(); + } + [LuaMethodAttributes( "borderheight", "Gets the current height in pixels of the border around the emulator's drawing area"