X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=0e72c47a5d379ff8f2179ff43ecb1914356b7673;hp=0f833b361515a5f51657546bf32bc8c030f98db4;hb=2c2063bc751d2b0db815c26734f186e64f0b9c12;hpb=6877205e9d8eed2b839be98c40679fa45a93e0ca

diff --git a/dwm.c b/dwm.c
index 0f833b3..0e72c47 100644
--- a/dwm.c
+++ b/dwm.c
@@ -259,7 +259,7 @@ applyrules(Client *c) {
 	XGetClassHint(dpy, c->win, &ch);
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if(r->title && strstr(c->name, r->title)
+		if((r->title && strstr(c->name, r->title))
 		|| (ch.res_class && r->class && strstr(ch.res_class, r->class))
 		|| (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
 		{
@@ -860,7 +860,7 @@ unsigned int
 idxoftag(const char *t) {
 	unsigned int i;
 
-	for(i = 0; (i < LENGTH(tags)) && strcmp(tags[i], t); i++);
+	for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
 	return (i < LENGTH(tags)) ? i : 0;
 }
 
@@ -1448,7 +1448,7 @@ setlayout(const char *arg) {
 
 void
 setup(void) {
-	unsigned int i;
+	unsigned int i, w;
 	XSetWindowAttributes wa;
 
 	/* init screen */
@@ -1503,14 +1503,14 @@ setup(void) {
 
 	/* init bar */
 	for(blw = i = 0; i < LENGTH(layouts); i++) {
-		i = textw(layouts[i].symbol);
-		if(i > blw)
-			blw = i;
+		w = textw(layouts[i].symbol);
+		if(w > blw)
+			blw = w;
 	}
 	for(bgw = i = 0; i < LENGTH(geoms); i++) {
-		i = textw(geoms[i].symbol);
-		if(i > bgw)
-			bgw = i;
+		w = textw(geoms[i].symbol);
+		if(w > bgw)
+			bgw = w;
 	}
 
 	wa.override_redirect = 1;