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

Allow un/pausing via menu while `PauseWhenMenuActivated` feature is on

This commit is contained in:
YoshiRulz 2022-01-17 13:37:08 +10:00
parent 4e5f0da800
commit 551fd72275
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
@ -602,7 +603,6 @@ namespace BizHawk.Client.EmuHawk
private void EmulationMenuItem_DropDownOpened(object sender, EventArgs e)
{
PauseMenuItem.Checked = _didMenuPause ? _wasPaused : EmulatorPaused;
PauseMenuItem.Enabled = !Config.PauseWhenMenuActivated;
SoftResetMenuItem.Enabled = Emulator.ControllerDefinition.BoolButtons.Contains("Reset")
&& !MovieSession.Movie.IsPlaying();
@ -618,6 +618,12 @@ namespace BizHawk.Client.EmuHawk
private void PauseMenuItem_Click(object sender, EventArgs e)
{
if (Config.PauseWhenMenuActivated && sender == PauseMenuItem)
{
const string ERR_MSG = nameof(PauseMenuItem_Click) + " ran before " + nameof(MaybeUnpauseFromMenuClosed) + "?";
Debug.Assert(EmulatorPaused == _wasPaused, ERR_MSG);
// fall through
}
TogglePause();
}