From d0d164e6daf6c1d8afe8099fb6187d8a74ff652b Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 8 Jun 2005 09:01:41 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20crash=20reported=20by=20=D8yvind=20Harboe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw/xwin/ChangeLog              | 5 +++++
 hw/xwin/winmultiwindowwindow.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 21f653a6c..06e503e2e 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-08  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* winmultiwindowwindow.c:
+	Fix crash reported by Øyvind Harboe
+
 2005-06-03  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winmultiwindowwndproc.c:
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index e9757a31d..b6df0f863 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -855,6 +855,11 @@ winMinimizeWindow (Window id)
 #endif
 
   pWin = LookupIDByType (id, RT_WINDOW);
+  if (!pWin) 
+  { 
+      ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__); 
+      return; 
+  }
 
   pScreen = pWin->drawable.pScreen;
   if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);