wmii

commit 7cb8271f66007734065e1d7ded4d7197aeeb5eb2
parent e5982aec2fc7ec81c85721ce3d9eae64170a957f
Author: Kris Maglione <jg@suckless.org>
Date:   Wed,  7 Feb 2007 21:26:02 -0500

Fixed last commit


Diffstat:
main.c
 | 
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/main.c b/main.c
@@ -19,6 +19,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
+Bool check_other_wm;
 static int (*x_error_handler) (Display *, XErrorEvent *);
 static char version[] = "wmiiwm - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
 
@@ -153,7 +154,7 @@ init_screen(WMScreen *screen) {
  */
 int
 wmii_error_handler(Display *dpy, XErrorEvent *error) {
-	if(starting)
+	if(check_other_wm)
 		ixp_eprint("wmiiwm: another window manager is already running\n");
 	if(error->error_code == BadWindow
 			|| (error->request_code == X_SetInputFocus
@@ -229,9 +230,11 @@ main(int argc, char *argv[]) {
 	blz.screen = DefaultScreen(blz.dpy);
 	blz.root = RootWindow(blz.dpy, blz.screen);
 
+	check_other_wm = True;
 	x_error_handler = XSetErrorHandler(wmii_error_handler);
 	XSelectInput(blz.dpy, blz.root, SubstructureRedirectMask | EnterWindowMask);
 	XSync(blz.dpy, False);
+	check_other_wm = False;
 
 	/* Check namespace permissions */
 	if(!strncmp(address, "unix!", 5)) {