From 1695fa6268a1e64ef57c5f599bd6fbbecc499cc5 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Fri, 18 Apr 2008 23:02:22 -0700
Subject: [PATCH] properly initialise the optional member

---
 dix/window.c  | 1 +
 fb/fbwindow.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dix/window.c b/dix/window.c
index f5a6a4b6f..9f4ae7162 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3689,6 +3689,7 @@ MakeWindowOptional (WindowPtr pWin)
     optional->userProps = NULL;
     optional->backingBitPlanes = ~0L;
     optional->backingPixel = 0;
+    optional->actualised = 0;
 #ifdef SHAPE
     optional->boundingShape = NULL;
     optional->clipShape = NULL;
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index b96d68b24..da2548d1a 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -31,6 +31,7 @@
 Bool
 fbCreateWindow(WindowPtr pWin)
 {
+    MakeWindowOptional(pWin);
     pWin->optional->actualised = 1;
 #ifndef FB_NO_WINDOW_PIXMAPS
     pWin->devPrivates[fbWinPrivateIndex].ptr =