diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-14 13:35:50 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-14 13:35:50 -0500 |
| commit | 1603130236c55ddabc3854d4ba62d544debcf1f5 (patch) | |
| tree | 02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /randr | |
| parent | f207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff) | |
| parent | f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/rrcrtc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 43486cddb..a40298f7d 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -151,7 +151,8 @@ RRCrtcNotify (RRCrtcPtr crtc, break; if (i == numOutputs) { - crtc->outputs[j]->crtc = NULL; + if (crtc->outputs[j]->crtc == crtc) + crtc->outputs[j]->crtc = NULL; RROutputChanged (crtc->outputs[j], FALSE); RRCrtcChanged (crtc, FALSE); } |