--- dix/main.c.orig	2009-07-25 17:49:45.835650099 -0400
+++ dix/main.c	2009-07-25 17:52:36.874100751 -0400
@@ -408,11 +408,15 @@
 	{
 	    Bool remember_it = noPanoramiXExtension;
 	    noPanoramiXExtension = TRUE;
+	    dispatchException |= 32;
 	    FreeAllResources();
+	    dispatchException &= ~32;
 	    noPanoramiXExtension = remember_it;
 	}
 #else
+	dispatchException |= 32;
 	FreeAllResources();
+	dispatchException &= ~32;
 #endif
 
         config_fini();
--- randr/rrproperty.c.orig	2009-07-25 17:50:34.204441935 -0400
+++ randr/rrproperty.c	2009-07-25 17:51:47.305048293 -0400
@@ -59,7 +59,7 @@
 
 static void RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event)
 {
-    if (!(dispatchException & (DE_RESET | DE_TERMINATE)))
+    if (!(dispatchException & (DE_RESET | DE_TERMINATE | 32)))
 	WalkTree(pScreen, DeliverPropertyEvent, event);
 }