diff options
| author | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
|---|---|---|
| committer | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
| commit | 08d45b9fea67714610cc6fdbe41e7bf1262816df (patch) | |
| tree | bd873fe49b79ecd9152523a98688749825f0b047 /Source/Core/DolphinWX/Debugger/CodeWindow.cpp | |
| parent | ff4bc5f33d6bfaab38d651b0706c77d705cf6c5c (diff) | |
| parent | c1944f623b5918ab45152795dea9e49f57878138 (diff) | |
Merge pull request #3794 from EmptyChaos/frame-advance-race
Core: Add synchronization to state changes (Fix Frame Step and FIFO Player - Issue 8718)
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index c0108dc026..4e5581ca8e 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -317,6 +317,7 @@ void CCodeWindow::StepOut() { if (CPU::IsStepping()) { + CPU::PauseAndLock(true, false); PowerPC::breakpoints.ClearAllTemporary(); // Keep stepping until the next blr or timeout after one second @@ -347,6 +348,7 @@ void CCodeWindow::StepOut() PowerPC::SingleStep(); PowerPC::SetMode(oldMode); + CPU::PauseAndLock(false, false); JumpToAddress(PC); Update(); |