From 3c7d5a1f6c188eed12275ff6884a6d8fd1669ffd Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 24 Feb 2013 15:45:52 +0100 Subject: Merge server-1.13.3rc1 branch from X.Org. up to e604b19fc54fee839bbe2d66930b36108ff03950 --- xserver/randr/rrcrtc.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xserver/randr/rrcrtc.c') diff --git a/xserver/randr/rrcrtc.c b/xserver/randr/rrcrtc.c index e82d050e3..6e2eca5ad 100644 --- a/xserver/randr/rrcrtc.c +++ b/xserver/randr/rrcrtc.c @@ -372,6 +372,11 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) ret = pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); if (crtc->scanout_pixmap) { master->StopPixmapTracking(mscreenpix, crtc->scanout_pixmap); + /* + * Unref the pixmap twice: once for the original reference, and once + * for the reference implicitly added by PixmapShareToSlave. + */ + master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap); master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap); crtc->pScreen->DestroyPixmap(crtc->scanout_pixmap); } -- cgit v1.2.3