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

Merge pull request #5315 from sepalani/debug-pause 

DoStop() shouldn't unpause in debug mode
This commit is contained in:
Léo Lam 2017-04-25 16:48:31 +02:00 committed by GitHub
parent 262adbe2bc 4a55398069
commit 7a615afe17
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -806,15 +806,16 @@ void CFrame::DoStop()
std::lock_guard<std::recursive_mutex> lk(keystate_lock); std::lock_guard<std::recursive_mutex> lk(keystate_lock);
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif #endif
// Pause the state during confirmation and restore it afterwards
Core::State state = Core::GetState();
// Ask for confirmation in case the user accidentally clicked Stop / Escape // Ask for confirmation in case the user accidentally clicked Stop / Escape
if (SConfig::GetInstance().bConfirmStop) if (SConfig::GetInstance().bConfirmStop)
{ {
// Exit fullscreen to ensure it does not cover the stop dialog. // Exit fullscreen to ensure it does not cover the stop dialog.
DoFullscreen(false); DoFullscreen(false);
// Pause the state during confirmation and restore it afterwards
Core::State state = Core::GetState();
// Do not pause if netplay is running as CPU thread might be blocked // Do not pause if netplay is running as CPU thread might be blocked
// waiting on inputs // waiting on inputs
bool should_pause = !NetPlayDialog::GetNetPlayClient(); bool should_pause = !NetPlayDialog::GetNetPlayClient();
@ -853,6 +854,7 @@ void CFrame::DoStop()
g_pCodeWindow->GetPanel<CBreakPointWindow>()->NotifyUpdate(); g_pCodeWindow->GetPanel<CBreakPointWindow>()->NotifyUpdate();
g_symbolDB.Clear(); g_symbolDB.Clear();
Host_NotifyMapLoaded(); Host_NotifyMapLoaded();
Core::SetState(state);
} }
// TODO: Show the author/description dialog here // TODO: Show the author/description dialog here
@ -881,8 +883,9 @@ bool CFrame::TriggerSTMPowerEvent()
return false; return false;
Core::DisplayMessage("Shutting down", 30000); Core::DisplayMessage("Shutting down", 30000);
// Unpause because gracefully shutting down needs the game to actually request a shutdown // Unpause because gracefully shutting down needs the game to actually request a shutdown.
if (Core::GetState() == Core::State::Paused) // Do not unpause in debug mode to allow debugging until the complete shutdown.
if (Core::GetState() == Core::State::Paused && !UseDebugger)
DoPause(); DoPause();
ProcessorInterface::PowerButton_Tap(); ProcessorInterface::PowerButton_Tap();
m_confirmStop = false; m_confirmStop = false;