Prevent winRaiseWindow from calling ConfigureWindow if the message was sent

    from within winDestroyWindowsWindow
DestroyWindow send a WM_WINDOWPOSCHANGED to another window causing a
    restacking of all windows, even of the window which is just about to
    destroyed and whose structures may not be intact anymore.

1 files changed, 5 insertions, 1 deletions

diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 0254bb00a..398751122 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -265,13 +265,17 @@ ValidateSizing (HWND hwnd, WindowPtr pWin,
   return TRUE;
 }
 
+extern Bool winInDestroyWindowsWindow;
 static void winRaiseWindow(WindowPtr pWin)
 {
+  if (!winInDestroyWindowsWindow)
+  {
     /* Call configure window directly to make sure it gets processed 
      * in time
      */
-    XID vlist[1] = { 0 }; 
+    XID vlist[1] = { 0 };
     ConfigureWindow(pWin, CWStackMode, vlist, NULL); 
+  }
 }