From 308477b6dfd26204046c09099aba293ea2b51095 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Sat, 23 Jan 1999 14:03:11 +0000
Subject: [PATCH] Set private data struct to NULL to expose problems in other
 code better. Fixes the XUnmapWindow problems reported by replacing them with
 NULL ptr dereferences.

---
 windows/x11drv/wnd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index 7ac624a19c9..7cd844dcd59 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -100,6 +100,10 @@ void X11DRV_WND_Finalize(WND *wndPtr)
   X11DRV_WND_DATA *pWndDriverData =
     (X11DRV_WND_DATA *) wndPtr->pDriverData;
 
+  if (!wndPtr->pDriverData) {
+     ERR(win,"Trying to destroy window again. Not good.\n");
+     return;
+  }
   if(pWndDriverData->window)
     {
       ERR(win, 
@@ -108,6 +112,7 @@ void X11DRV_WND_Finalize(WND *wndPtr)
 	  pWndDriverData->window
       );
     }
+  wndPtr->pDriverData = NULL;
   HeapFree(SystemHeap, 0, wndPtr->pDriverData);
 }