From 865af20e32591176d03acf984d9b5788d5ebce21 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 14 Jul 2010 06:40:19 +0000 Subject: xserver libxcb git update 14/7/2010 --- xorg-server/hw/xfree86/common/xf86cmap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xorg-server/hw/xfree86/common/xf86cmap.c') diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c index 851843faa..191ae6132 100644 --- a/xorg-server/hw/xfree86/common/xf86cmap.c +++ b/xorg-server/hw/xfree86/common/xf86cmap.c @@ -466,11 +466,17 @@ CMapInstallColormap(ColormapPtr pmap) static Bool CMapEnterVT(int index, int flags) { + ScrnInfoPtr pScrn = xf86Screens[index]; ScreenPtr pScreen = screenInfo.screens[index]; + Bool ret; CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate( &pScreen->devPrivates, CMapScreenKey); - if((*pScreenPriv->EnterVT)(index, flags)) { + pScrn->EnterVT = pScreenPriv->EnterVT; + ret = (*pScreenPriv->EnterVT)(index, flags); + pScreenPriv->EnterVT = pScrn->EnterVT; + pScrn->EnterVT = CMapEnterVT; + if(ret) { if(GetInstalledmiColormap(pScreen)) CMapReinstallMap(GetInstalledmiColormap(pScreen)); return TRUE; -- cgit v1.2.3