summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-11-04 17:43:19 -0800
committerKeith Packard <keithp@neko.keithp.com>2006-11-04 17:43:19 -0800
commit50504c68e1d407232cf83465981b235e542ef31f (patch)
treedf7dd1034d974f7843cde0c85a316d4dbf1c9fb4
parent8b87ce19741753eafbd99e7093bc3dea8f26e838 (diff)
parentcde8806c2930788ba8076e94651d391e45f3ccdb (diff)
Merge branch 'randr-1.2-origin' into randr-1.2
-rw-r--r--randr/rrcrtc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index c40dac129..76d0b6bf5 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -174,7 +174,8 @@ RRCrtcNotify (RRCrtcPtr crtc,
if (crtc->mode)
RRModeDestroy (crtc->mode);
crtc->mode = mode;
- mode->refcnt++;
+ if (mode != NULL)
+ mode->refcnt++;
RRCrtcChanged (crtc, TRUE);
}
if (x != crtc->x)