xserver: Branch 'randr-1.2'

[Eric Anholt]

 randr/rrcrtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree cde8806c2930788ba8076e94651d391e45f3ccdb (from 4056e6e79a4e37101d298ae29139c83d3816368b)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 3 16:36:34 2006 -0800

    Don't bump the refcnt if the new mode is NULL.

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index c40dac1..76d0b6b 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)