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

Fixed crash that occurred when cheat list was opened

Browse source
This commit is contained in:
Souryo 2017-09-06 21:40:59 -04:00
parent a89b2408a4
commit 5b8a37e392
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/Console.cpp
View file

@ -394,6 +394,8 @@ void Console::Run()
_runLock.Acquire(); _runLock.Acquire();
} }
shared_ptr<Debugger> debugger = _debugger;
bool paused = EmulationSettings::IsPaused(); bool paused = EmulationSettings::IsPaused();
if(paused && !_stop) { if(paused && !_stop) {
MessageManager::SendNotification(ConsoleNotificationType::GamePaused); MessageManager::SendNotification(ConsoleNotificationType::GamePaused);
@ -404,13 +406,13 @@ void Console::Run()
_runLock.Release(); _runLock.Release();
PlatformUtilities::EnableScreensaver(); PlatformUtilities::EnableScreensaver();
while(paused && !_stop && (!_debugger || !_debugger->CheckFlag(DebuggerFlags::DebuggerWindowEnabled))) { while(paused && !_stop && (!debugger || !debugger->CheckFlag(DebuggerFlags::DebuggerWindowEnabled))) {
//Sleep until emulation is resumed //Sleep until emulation is resumed
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(30)); std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(30));
paused = EmulationSettings::IsPaused(); paused = EmulationSettings::IsPaused();
} }
if(_debugger && _debugger->CheckFlag(DebuggerFlags::DebuggerWindowEnabled)) { if(debugger && debugger->CheckFlag(DebuggerFlags::DebuggerWindowEnabled)) {
//Prevent pausing when debugger is active //Prevent pausing when debugger is active
EmulationSettings::ClearFlags(EmulationFlags::Paused); EmulationSettings::ClearFlags(EmulationFlags::Paused);
} }
@ -420,8 +422,8 @@ void Console::Run()
MessageManager::SendNotification(ConsoleNotificationType::GameResumed); MessageManager::SendNotification(ConsoleNotificationType::GameResumed);
} }
if(_debugger) { if(debugger) {
_debugger->ProcessEvent(EventType::StartFrame); debugger->ProcessEvent(EventType::StartFrame);
} }
//Get next target time, and adjust based on whether we are ahead or behind //Get next target time, and adjust based on whether we are ahead or behind