From ce9eff9e4c30deb16f059ed84b436d37da45d5d5 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Mon, 20 Dec 2010 16:33:36 +0200 Subject: composite: Call ValidateGC after ChangeGC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ChangeGC changes the GC, so ValidateGC should be called after it, not before. Also pass NullClient instead of serverClient to ChangeGC() since we know the changed values to be valid, and setting serverClient->errorValue seems pointless anyway. Signed-off-by: Ville Syrjälä Reviewed-by: Keith Packard Reviewed-by: Adam Jackson Reviewed-by: Daniel Stone --- composite/compalloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composite/compalloc.c b/composite/compalloc.c index 7164c0d3c..2b6864519 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -536,9 +536,8 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) { ChangeGCVal val; val.val = IncludeInferiors; - + ChangeGC (NullClient, pGC, GCSubwindowMode, &val); ValidateGC(&pPixmap->drawable, pGC); - ChangeGC (serverClient, pGC, GCSubwindowMode, &val); (*pGC->ops->CopyArea) (&pParent->drawable, &pPixmap->drawable, pGC, -- cgit v1.2.3