From 61d140c66c89a77af8cce0166bf881c4f5d69233 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat, 30 Aug 2008 09:10:27 -0700
Subject: [PATCH] XQuartz: Made NewCurrentScreen debugging a little safer

---
 dix/events.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 6a2fff186..731f04f60 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2388,9 +2388,9 @@ NewCurrentScreen(ScreenPtr newScreen, int x, int y)
 #ifdef XQUARTZ
     /* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
     snprintf(__crashreporter_info__, __crashreporter_info__len, "%s\n\nNewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
-             __crashreporter_info__base, noPanoramiXExtension, newScreen,newScreen->myNum);
+             __crashreporter_info__base, noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
     ErrorF("NewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
-           noPanoramiXExtension, newScreen, newScreen->myNum);
+           noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
 #endif
 #ifdef PANORAMIX
     if(!noPanoramiXExtension) {