Vincent Povirk : winex11.drv: Don' t set gamma when UseXVidMode is turned off.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 62802b8bdf8409ed0be2657c4d22320809297884
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=62802b8bdf8409ed0be2657c4d...

Author: Vincent Povirk 
Date:   Tue Aug  2 15:28:36 2011 -0500

winex11.drv: Don't set gamma when UseXVidMode is turned off.

---

dlls/winex11.drv/xvidmode.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index c432c01..c09fe39 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)
   {