diff --git a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
index c4ce81b24e..7f39f43b47 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
@@ -784,6 +784,14 @@ namespace BizHawk.Client.EmuHawk
 				//only used by alternate vsync
 				var dx9 = GlobalWin.GL as BizHawk.Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9;
 
+				//ok, now this is a bit undesireable.
+				//maybe the user wants vsync, but not vsync throttle.
+				//this makes sense... but we dont have the infrastructure to support it now (we'd have to enable triple buffering or something like that)
+				//so what we're gonna do is disable vsync no matter what if throttling is off, and maybe nobody will notice.
+				//update 26-mar-2016: this upsets me. When fastforwarding and skipping frames, vsync should still work. But I'm not changing it yet
+				if (Global.DisableSecondaryThrottling)
+					vsync = false;
+
 				//for now, it's assumed that the presentation panel is the main window, but that may not always be true
 				bool alternateVsync = false;
 				if (dx9 != null)
@@ -797,14 +805,6 @@ namespace BizHawk.Client.EmuHawk
 				//TODO - whats so hard about triple buffering anyway? just enable it always, and change api to SetVsync(enable,throttle)
 				//maybe even SetVsync(enable,throttlemethod) or just SetVsync(enable,throttle,advanced)
 
-				//ok, now this is a bit undesireable.
-				//maybe the user wants vsync, but not vsync throttle.
-				//this makes sense... but we dont have the infrastructure to support it now (we'd have to enable triple buffering or something like that)
-				//so what we're gonna do is disable vsync no matter what if throttling is off, and maybe nobody will notice.
-				//update 26-mar-2016: this upsets me. When fastforwarding and skipping frames, vsync should still work. But I'm not changing it yet
-				if (Global.DisableSecondaryThrottling)
-					vsync = false;
-
 				if (LastVsyncSetting != vsync || LastVsyncSettingGraphicsControl != presentationPanel.GraphicsControl)
 				{
 					if (LastVsyncSetting == null && vsync)
diff --git a/output64/dll/gpgx.elf b/output64/dll/gpgx.elf
index 0d81bf57b9..52902b83fb 100644
Binary files a/output64/dll/gpgx.elf and b/output64/dll/gpgx.elf differ