From 62802b8bdf8409ed0be2657c4d22320809297884 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Tue, 2 Aug 2011 15:28:36 -0500
Subject: [PATCH] winex11.drv: Don't set gamma when UseXVidMode is turned off.

---
 dlls/winex11.drv/xvidmode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index c432c01499a..c09fe39da07 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -389,7 +389,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
 #ifdef X_XF86VidModeSetGamma
   XF86VidModeGamma gamma;
 
-  if (xf86vm_major < 2) return FALSE; /* no gamma control */
+  if (xf86vm_major < 2 || !usexvidmode) return FALSE; /* no gamma control */
 #ifdef X_XF86VidModeSetGammaRamp
   else if (xf86vm_use_gammaramp)
   {