File xorg-java-wmhack-2.diff of Package xorg-x11-server-dmx

diff --git a/dix/window.c b/dix/window.c
index cf44a63..415619e 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1292,8 +1292,12 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    rc = EventSelectForWindow(pWin, client, (Mask )*pVlist);
 	    if (rc)
 	    {
-		error = rc;
-		goto PatchUp;
+		if (vmask != CWEventMask ||
+ 		    (Mask)*pVlist != SubstructureRedirectMask)
+ 		{
+		    error = rc;
+		    goto PatchUp;
+ 		}
 	    }
 	    pVlist++;
 	    break;