X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=d566c9e3055ae782b3bf5a9a901b86fbcecbd480;hb=5e9acbc952ef6c323e456fbef82fa5b1c5a9cde2;hp=545efe9c422b0a05d36d2e4ec5c27fc25e29fed0;hpb=24d91e3b8a6e173bf65d5dd611b164dcb6a01978;p=dwm.git

diff --git a/main.c b/main.c
index 545efe9..d566c9e 100644
--- a/main.c
+++ b/main.c
@@ -18,11 +18,12 @@
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
-static Bool otherwm;
+static Bool otherwm, readin;
 
 static void
 cleanup()
 {
+	close(STDIN_FILENO);
 	while(sel) {
 		resize(sel, True, TopLeft);
 		unmanage(sel);
@@ -32,9 +33,9 @@ cleanup()
 	else
 		XFreeFont(dpy, dc.font.xfont);
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	XDestroyWindow(dpy, barwin);
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
+	XDestroyWindow(dpy, barwin);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
 }
@@ -146,7 +147,7 @@ sendevent(Window w, Atom a, long value)
 void
 quit(Arg *arg)
 {
-	running = False;
+	readin = running = False;
 }
 
 /*
@@ -176,7 +177,6 @@ main(int argc, char *argv[])
 	int i, j, xfd;
 	unsigned int mask;
 	fd_set rd;
-	Bool readin = True;
 	Window w;
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
@@ -279,6 +279,7 @@ main(int argc, char *argv[])
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	procevent();
+	readin = True;
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)