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-20 13:32:21 +1000
commitf713f447a2110718dfc091380699362d76f0cd6c (patch)
tree8e1de2076d112df841c859f4c3ffcae74e81df43
parent664a8e37fd83141974b772980f680b94e48b4f87 (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>
-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 f453ad3f0..f9e46db1e 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;