diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-12-12 06:05:21 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-12-12 06:05:21 +0000 |
| commit | dff4a3473cbf3db68b2fa5b43e51f8c05ae6b029 (patch) | |
| tree | ae898a699dbc977738010eaae623435d2ccee50a /xserver/randr | |
| parent | 005295117c63143b3bf6d69d4503b360e660cf49 (diff) | |
Update to X server 1.20.6. Tested by naddy@
Diffstat (limited to 'xserver/randr')
| -rw-r--r-- | xserver/randr/rrcrtc.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xserver/randr/rrcrtc.c b/xserver/randr/rrcrtc.c index a851aebcc..ae7e30605 100644 --- a/xserver/randr/rrcrtc.c +++ b/xserver/randr/rrcrtc.c @@ -401,17 +401,22 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) if (crtc->scanout_pixmap_back) { pScrPriv->rrDisableSharedPixmapFlipping(crtc); - master->StopFlippingPixmapTracking(mrootdraw, - crtc->scanout_pixmap, - crtc->scanout_pixmap_back); + if (mrootdraw) { + master->StopFlippingPixmapTracking(mrootdraw, + crtc->scanout_pixmap, + crtc->scanout_pixmap_back); + } rrDestroySharedPixmap(crtc, crtc->scanout_pixmap_back); crtc->scanout_pixmap_back = NULL; } else { pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); - master->StopPixmapTracking(mrootdraw, - crtc->scanout_pixmap); + + if (mrootdraw) { + master->StopPixmapTracking(mrootdraw, + crtc->scanout_pixmap); + } } rrDestroySharedPixmap(crtc, crtc->scanout_pixmap); |