X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=7d19b07a1bdced0482fc04947a05dca8cddea36d;hp=413e79541b2b0d5b1abca311df621a779f58fc48;hb=956a430054d5bb1869289475f4f7989552489f77;hpb=eb260b1a414fb82fc01d3638e3e77495297c45d5

diff --git a/dwm.c b/dwm.c
index 413e795..7d19b07 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1039,9 +1039,15 @@ killclient(const Arg *arg) {
 		ev.xclient.data.l[1] = CurrentTime;
 		XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
 	}
-	else
+	else {
+		XGrabServer(dpy);
+		XSetErrorHandler(xerrordummy);
+		XSetCloseDownMode(dpy, DestroyAll);
 		XKillClient(dpy, selmon->sel->win);
-	XSync(dpy, False);
+		XSync(dpy, False);
+		XSetErrorHandler(xerror);
+		XUngrabServer(dpy);
+	}
 }
 
 void
@@ -1646,6 +1652,7 @@ unmanage(Client *c, Bool destroyed) {
 	}
 	free(c);
 	focus(NULL);
+	arrange();
 }
 
 void