diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
| commit | 8e69b2fa996acf8fa1d218b67a203eb67e280899 (patch) | |
| tree | 1caebab7024f5b62dc57e49a69a20ef10cb8210f /xorg-server/randr/randr.c | |
| parent | cd103d3f4d59ac4f09cfcf126e572ddb0b9d4628 (diff) | |
| parent | f6d1847eef027266daa0f75ee92ceb09698b2761 (diff) | |
| download | vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.gz vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.bz2 vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'xorg-server/randr/randr.c')
| -rw-r--r-- | xorg-server/randr/randr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c index 4d4298af9..103da48d7 100644 --- a/xorg-server/randr/randr.c +++ b/xorg-server/randr/randr.c @@ -446,6 +446,9 @@ RRFirstOutput(ScreenPtr pScreen) RROutputPtr output; int i, j; + if (!pScrPriv) + return NULL; + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) return pScrPriv->primaryOutput; |