summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-06-30 18:50:20 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-06-30 18:50:20 +0000
commit1230c55ac3f75f4902b51b223d40354a54d0d0ab (patch)
tree2d97488ea19426ce8c8cc3d50e88ee0a7e472f0b
parent0929f79c1baa5b65808ab034591510906623e841 (diff)
Pass serverClient instead of NULL to ConfigureWindow. This should fix a
crash reported by Øyvind Harboe
-rw-r--r--hw/xwin/ChangeLog6
-rwxr-xr-xhw/xwin/winmultiwindowwndproc.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 82a656021..993313fa0 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30 Alexander Gottwald <ago at freedesktop dot org>
+
+ * winmultiwindowwndproc.c:
+ Pass serverClient instead of NULL to ConfigureWindow.
+ This should fix a crash reported by Øyvind Harboe
+
2005-06-08 Alexander Gottwald <ago at freedesktop dot org>
* winlayouts.h:
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 93ddcd4b3..b4f53dc2e 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -277,7 +277,7 @@ static void winRaiseWindow(WindowPtr pWin)
* in time
*/
XID vlist[1] = { 0 };
- ConfigureWindow(pWin, CWStackMode, vlist, NULL);
+ ConfigureWindow(pWin, CWStackMode, vlist, serverClient);
winInRaiseWindow = oldstate;
}
}