From 6ba4c534507676abe7d7ac415cb113cd40953925 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 24 Jan 2012 15:45:21 +0100
Subject: Avoid possible crash in multiwindow mode

---
 xorg-server/hw/xwin/winmultiwindowwndproc.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 4e836fa06..eb2b51020 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -363,6 +363,10 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       fWMMsgInitialized = TRUE;
 
     }
+  else if (message!=WM_CREATE)
+    {  // Avoid crashes when pWin == NULL, which happens sometimes (I think during closing of windows)
+      return DefWindowProc (hwnd, message, wParam, lParam);
+    }
 
   /* Branch on message type */
   switch (message)
-- 
cgit v1.2.3