winex11: Simplify X11DRV_XRandR_Init() error handling a bit.
This commit is contained in:
parent
7b32809890
commit
5ed890904b
|
@ -277,18 +277,15 @@ void X11DRV_XRandR_Init(void)
|
||||||
|
|
||||||
/* see if Xrandr is available */
|
/* see if Xrandr is available */
|
||||||
wine_tsx11_lock();
|
wine_tsx11_lock();
|
||||||
ok = pXRRQueryExtension(gdi_display, &xrandr_event, &xrandr_error);
|
if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done;
|
||||||
if (ok)
|
X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL );
|
||||||
{
|
ok = pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor );
|
||||||
X11DRV_expect_error(gdi_display, XRandRErrorHandler, NULL);
|
if (X11DRV_check_error() || !ok) goto done;
|
||||||
ok = pXRRQueryVersion(gdi_display, &xrandr_major, &xrandr_minor);
|
|
||||||
if (X11DRV_check_error()) ok = FALSE;
|
TRACE("Found XRandR %d.%d.\n", xrandr_major, xrandr_minor);
|
||||||
}
|
xrandr_init_modes();
|
||||||
if (ok)
|
|
||||||
{
|
done:
|
||||||
TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor);
|
|
||||||
xrandr_init_modes();
|
|
||||||
}
|
|
||||||
wine_tsx11_unlock();
|
wine_tsx11_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue