Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8446 from unknownbrackets/minor

Browse Source 
Don't attempt pause while stepping
This commit is contained in:
Henrik Rydgård 2016-01-18 00:54:12 +01:00
commit 14fb4f2c22
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Windows/GPU/WindowsGLContext.cpp
View File

@ -24,6 +24,7 @@
#include "GL/gl.h"
#include "GL/wglew.h"
#include "Core/Config.h"
#include "Core/Core.h"
#include "util/text/utf8.h"
#include "i18n/i18n.h"
#include "UI/OnScreenDisplay.h"
@ -54,6 +55,9 @@ void WindowsGLContext::Pause() {
if (!hRC) {
return;
}
if (Core_IsStepping()) {
return;
}
pauseRequested = true;
DWORD result = WaitForSingleObject(pauseEvent, INFINITE);
@ -67,6 +71,9 @@ void WindowsGLContext::Resume() {
if (!hRC) {
return;
}
if (Core_IsStepping() && !resumeRequested) {
return;
}
if (!resumeRequested) {
ERROR_LOG(G3D, "Not waiting to get resumed");