empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fixed issue with game selection screen getting activated by keypresses when game is paused

Browse source
This commit is contained in:
Souryo 2017-10-03 18:18:29 -04:00
parent afa4ae85e3
commit 5066c89570
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/Console.cpp
View file

@ -484,7 +484,12 @@ void Console::Run()
bool Console::IsRunning() bool Console::IsRunning()
{ {
return !Instance->_stopLock.IsFree() && !Instance->_runLock.IsFree(); return !Instance->_stopLock.IsFree();
}
bool Console::IsPaused()
{
return _runLock.IsFree();
} }
void Console::UpdateNesModel(bool sendNotification) void Console::UpdateNesModel(bool sendNotification)

1
Core/Console.h
View file

@ -101,6 +101,7 @@ class Console
static void ResetLagCounter(); static void ResetLagCounter();
static bool IsRunning(); static bool IsRunning();
bool IsPaused();
static void SetNextFrameOverclockStatus(bool disabled); static void SetNextFrameOverclockStatus(bool disabled);

2
Core/Debugger.cpp
View file

@ -887,7 +887,7 @@ shared_ptr<MemoryAccessCounter> Debugger::GetMemoryAccessCounter()
bool Debugger::IsExecutionStopped() bool Debugger::IsExecutionStopped()
{ {
return _executionStopped || !_console->IsRunning(); return _executionStopped || _console->IsPaused();
} }
void Debugger::GetAbsoluteAddressAndType(uint32_t relativeAddr, AddressTypeInfo* info) void Debugger::GetAbsoluteAddressAndType(uint32_t relativeAddr, AddressTypeInfo* info)