diff options
author | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
commit | 578938f1cdd5a06dd6fa28167d575ec980322a5d (patch) | |
tree | e31cf77fab7cc6e005b0e726e7951d7eef79550f /xorg-server/dix/colormap.c | |
parent | 0032f9b66d63a4b1c5222edb8603fb60da379fb0 (diff) | |
download | vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.gz vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.bz2 vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.zip |
Update to git master branch of xserver.
Diffstat (limited to 'xorg-server/dix/colormap.c')
-rw-r--r-- | xorg-server/dix/colormap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c index d702b0204..bf9794125 100644 --- a/xorg-server/dix/colormap.c +++ b/xorg-server/dix/colormap.c @@ -2705,6 +2705,9 @@ static void _colormap_find_resource(pointer value, XID id, ColormapPtr cmap = value; int j; + if (pScreen != cmap->pScreen) + return; + j = cmap->pVisual - pScreen->visuals; cmap->pVisual = &visuals[j]; } |