summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-12-12 07:55:51 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2014-12-12 07:55:51 +0000
commit60ebac591596ccb768b684b1909064570dd1cf47 (patch)
treea5a0b55c8f0f98a78b428401b53834f114508f47 /src
parentf587d71f3c91f9ddcc4cdbe8a0f9ce59590d9db2 (diff)
sna: Add another Xinerama vs RandR guard
Another place used rrScrPriv without checking for its validity. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87257 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 772c8360..90414c74 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5924,7 +5924,7 @@ sna_mode_set_primary(struct sna *sna)
rrScrPrivPtr rr = rrGetScrPriv(xf86ScrnToScreen(sna->scrn));
int i;
- if (rr->primaryOutput)
+ if (rr == NULL || rr->primaryOutput)
return;
for (i = 0; i < sna->mode.num_real_output; i++) {