summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahu <freedesktop-bugs@dyweni.com>2009-10-19 15:43:59 -0500
committerPeter Hutterer <peter.hutterer@who-t.net>2009-10-22 07:53:52 +1000
commitd6d3620faf23ce9adc2b91a1255f16344fc9894e (patch)
tree619aca3ea7524f91c6e53d09ceddb4220c5d7880
parentd1da013b323a1131d561e85af4488c6e3dbf2dba (diff)
dmxDestroyWindow() - must call the X's native DetroyWindow()
Don't really know why this section was disabled, but without it, certain pPicture resources do not get free'd until later in the FreeClientResources() process after the screen has been free'd - resulting in seg fault. With this patch, all resources normally free'd using vanilla X are now also being freed correctly by Xdmx. https://bugs.freedesktop.org/show_bug.cgi?id=24576 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f713f447a2110718dfc091380699362d76f0cd6c)
-rw-r--r--hw/dmx/dmxwindow.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 24acc08e3..ec9a29ac4 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
pWinPriv->windowDestroyed(pWindow);
#endif
-#if 0
if (pScreen->DestroyWindow)
ret = pScreen->DestroyWindow(pWindow);
-#endif
+
DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);
return ret;