diff -r d5c3537ee3be -r b2a0dfa22b1d event.c
--- a/event.c	Sun Aug 19 18:50:47 2007 +0200
+++ b/event.c	Wed Aug 22 19:01:05 2007 +0200
@@ -221,7 +221,7 @@
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
 	if((c = getclient(ev->window)))
-		unmanage(c, WithdrawnState);
+		unmanage(c);
 }
 
 static void
@@ -332,10 +332,8 @@
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
-	if((c = getclient(ev->window)) && (ev->event == root)) {
-		if(ev->send_event || c->unmapped-- == 0)
-			unmanage(c, WithdrawnState);
-	}
+	if((c = getclient(ev->window)))
+		unmanage(c);
 }
 
 /* extern */