Merge pull request #533 from Anti-Ultimate/master

Fix OpenGL VSync
dolphin-emu · Jun 28, 2014 · aae1630 · aae1630
2 parents e0bedc3 + aacf885
commit aae1630
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp
@@ -127,12 +127,7 @@ bool cInterfaceWGL::Create(void *&window_handle)
 
 bool cInterfaceWGL::MakeCurrent()
 {
-	return wglMakeCurrent(hDC, hRC) ? true : false;
-}
-
-bool cInterfaceWGL::ClearCurrent()
-{
-	bool success = wglMakeCurrent(hDC, nullptr) ? true : false;
+	bool success = wglMakeCurrent(hDC, hRC) ? true : false;
 	if (success)
 	{
 		// Grab the swap interval function pointer
@@ -141,6 +136,11 @@ bool cInterfaceWGL::ClearCurrent()
 	return success;
 }
 
+bool cInterfaceWGL::ClearCurrent()
+{
+	return wglMakeCurrent(hDC, nullptr) ? true : false;
+}
+
 // Update window width, size and etc. Called from Render.cpp
 void cInterfaceWGL::Update()
 {