aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/dri2
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 07:28:49 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 07:28:49 +0000
commit2a31e38d82566c4f93773ecf9c79f2cc9abef169 (patch)
treeab9cdebe56affbbad49351f5e8557058673efcc1 /xorg-server/hw/xfree86/dri2
parent6753f87d9a6be8dcab916b479a0a122b1b375298 (diff)
downloadvcxsrv-2a31e38d82566c4f93773ecf9c79f2cc9abef169.tar.gz
vcxsrv-2a31e38d82566c4f93773ecf9c79f2cc9abef169.tar.bz2
vcxsrv-2a31e38d82566c4f93773ecf9c79f2cc9abef169.zip
xserver and libxcb git update 11/6/2010
Diffstat (limited to 'xorg-server/hw/xfree86/dri2')
-rw-r--r--xorg-server/hw/xfree86/dri2/dri2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index bb1be358b..123bc3225 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -957,8 +957,12 @@ Bool
DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
const char **driverName, const char **deviceName)
{
- DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+ DRI2ScreenPtr ds;
+
+ if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))
+ return FALSE;
+ ds = DRI2GetScreen(pScreen);
if (ds == NULL || driverType >= ds->numDrivers ||
!ds->driverNames[driverType])
return FALSE;