Don't attempt pause while stepping.

We'll just hang in that case.
hrydgard · Jan 17, 2016 · b29df00 · b29df00
1 parent 6d6c415
commit b29df00
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()) {
+		return;
+	}
 
 	if (!resumeRequested) {
 		ERROR_LOG(G3D, "Not waiting to get resumed");