aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-24 15:45:21 +0100
committermarha <marha@users.sourceforge.net>2012-01-24 16:08:04 +0100
commit6ba4c534507676abe7d7ac415cb113cd40953925 (patch)
treeb0dd46f6c909d04e2bbf0e64c278dd03c0f05cb6
parente665d084d9fe8a98cc663e2eb627f13ccb263046 (diff)
downloadvcxsrv-6ba4c534507676abe7d7ac415cb113cd40953925.tar.gz
vcxsrv-6ba4c534507676abe7d7ac415cb113cd40953925.tar.bz2
vcxsrv-6ba4c534507676abe7d7ac415cb113cd40953925.zip
Avoid possible crash in multiwindow mode
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwndproc.c4
1 files changed, 4 insertions, 0 deletions
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)