From 955ccfbc34f370c80f7189ac5b0240e859e00b5f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Feb 2010 07:52:50 -0800 Subject: [PATCH] glamor: Fix the segfault at screen fini. --- glamor/glamor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 03db7ecec..b7259afa4 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -260,8 +260,10 @@ glamor_fini(ScreenPtr screen) screen->CopyWindow = glamor_priv->saved_copy_window; screen->BitmapToRegion = glamor_priv->saved_bitmap_to_region; #ifdef RENDER - ps->Composite = glamor_priv->saved_composite; - ps->Trapezoids = glamor_priv->saved_trapezoids; - ps->Glyphs = glamor_priv->saved_glyphs; + if (ps) { + ps->Composite = glamor_priv->saved_composite; + ps->Trapezoids = glamor_priv->saved_trapezoids; + ps->Glyphs = glamor_priv->saved_glyphs; + } #endif }