diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
| commit | 8fb9d7f4ca923dc7f640a0df6c871348a3e554ab (patch) | |
| tree | 39ebbf9255fe0fd660ea645f4ebdef3287a5078b /xorg-server/hw/xfree86/common/xf86cmap.c | |
| parent | 80b785273c916676a94cbe1d7dfbbc93b58127d5 (diff) | |
| parent | 865af20e32591176d03acf984d9b5788d5ebce21 (diff) | |
| download | vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.gz vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.bz2 vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86cmap.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86cmap.c | 8 |
1 files changed, 7 insertions, 1 deletions
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;
|