Jesse Allen : x11drv: Allow xvidmode to always initialize at least for the gamma functions.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 094b18f4b9485efc47ca8a9ad7f84a24c3966211
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=094b18f4b9485efc47ca8a9a...

Author: Jesse Allen <the3dfxdude(a)gmail.com>
Date:   Mon Apr  3 18:38:10 2006 -0700

x11drv: Allow xvidmode to always initialize at least for the gamma functions.

---

 dlls/x11drv/xvidmode.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c
index c32bd59..628b106 100644
--- a/dlls/x11drv/xvidmode.c
+++ b/dlls/x11drv/xvidmode.c
@@ -148,8 +148,6 @@ void X11DRV_XF86VM_Init(void)
 
   if (xf86vm_major) return; /* already initialized? */
 
-  if (!usexvidmode) return;
-
   /* see if XVidMode is available */
   wine_tsx11_lock();
   ok = XF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error);
@@ -172,7 +170,7 @@ void X11DRV_XF86VM_Init(void)
 #endif /* X_XF86VidModeSetGammaRamp */
 
       /* retrieve modes */
-      if (root_window == DefaultRootWindow( gdi_display ))
+      if (usexvidmode && root_window == DefaultRootWindow( gdi_display ))
           ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes);
       else
           ok = FALSE; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */