fixed merge
authorAnselm R Garbe <garbeam@gmail.com>
Fri, 29 Aug 2008 11:29:42 +0100
branchmerge
changeset 1349 56c2529afeab
parent 1348 18098673e417
child 1350 d95d9bae4dc3
fixed
dwm.c
--- a/dwm.c	Fri Aug 29 10:13:47 2008 +0100
+++ b/dwm.c	Fri Aug 29 11:29:42 2008 +0100
@@ -250,21 +250,21 @@
 	XClassHint ch = { 0 };
 
 	/* rule matching */
-	if(XGetClassHint(dpy, c->win, &ch) == 0)
-		return;
-	for(i = 0; i < LENGTH(rules); i++) {
-		r = &rules[i];
-		if((!r->title || strstr(c->name, r->title))
-		&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
-		&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
-			c->isfloating = r->isfloating;
-			c->tags |= r->tags & TAGMASK;
+	if(XGetClassHint(dpy, c->win, &ch)) {
+		for(i = 0; i < LENGTH(rules); i++) {
+			r = &rules[i];
+			if((!r->title || strstr(c->name, r->title))
+			&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+			&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+				c->isfloating = r->isfloating;
+				c->tags |= r->tags & TAGMASK;
+			}
 		}
+		if(ch.res_class)
+			XFree(ch.res_class);
+		if(ch.res_name)
+			XFree(ch.res_name);
 	}
-	if(ch.res_class)
-		XFree(ch.res_class);
-	if(ch.res_name)
-		XFree(ch.res_name);
 	if(!c->tags)
 		c->tags = tagset[seltags];
 }