From e5b405121150791b43000ef42274c77f5853af3a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 17 Jan 2016 15:42:39 -0800 Subject: [PATCH] Don't attempt pause while stepping. We'll just hang in that case. --- Windows/GPU/WindowsGLContext.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Windows/GPU/WindowsGLContext.cpp b/Windows/GPU/WindowsGLContext.cpp index 82cacb910f..e345cc9886 100644 --- a/Windows/GPU/WindowsGLContext.cpp +++ b/Windows/GPU/WindowsGLContext.cpp @@ -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");