--- vsync.cpp.old	2005-05-22 10:39:43.000000000 -0700
+++ vsync.cpp	2005-05-22 10:53:50.000000000 -0700
@@ -84,7 +84,10 @@
     TESTVIDEOSYNC(nVidiaVideoSync)
     TESTVIDEOSYNC(DRMVideoSync)
 #ifdef USING_OPENGL_VSYNC
-    TESTVIDEOSYNC(OpenGLVideoSync)
+    if ((gContext->GetNumSetting("UseOpenGLVSync", 1)) && (getenv("NO_OPENGL_VSYNC") == NULL))
+    {
+        TESTVIDEOSYNC(OpenGLVideoSync)
+    }
 #endif
 #ifdef __linux__
     TESTVIDEOSYNC(RTCVideoSync)