diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 517cdf00a..c8626b982 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -2012,9 +2012,15 @@ RRReplaceScanoutPixmap(DrawablePtr pDrawable, PixmapPtr pPixmap, Bool enable) Bool RRHasScanoutPixmap(ScreenPtr pScreen) { - rrScrPriv(pScreen); + rrScrPrivPtr pScrPriv; int i; + /* Bail out if RandR wasn't initialized. */ + if (!dixPrivateKeyRegistered(rrPrivKey)) + return FALSE; + + pScrPriv = rrGetScrPriv(pScreen); + if (!pScreen->is_output_secondary) return FALSE;