Merge pull request #8446 from unknownbrackets/minor

Don't attempt pause while stepping
hrydgard · Jan 17, 2016 · 14fb4f2 · 14fb4f2
2 parents 5161476 + e5b4051
commit 14fb4f2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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");