X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=ec872285a4c05c8b8de3e71d6f4259fc2f3e22a3;hb=0f26de991f742d548e024a2dadcbfa3a7db8d4b2;hp=146d344d497819e197a32e797d1e92a07246e4f4;hpb=47f63dce550fab02f9d15aca5cec8c137125ac16;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 146d344..ec87228 100644
--- a/dwm.c
+++ b/dwm.c
@@ -581,7 +581,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
-	for(len = MIN(olen, sizeof buf); len && textnw(buf, len) > dc.w - h; len--);
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
 	if(!len)
 		return;
 	memcpy(buf, text, len);
@@ -1128,7 +1128,7 @@ resizemouse(const Arg *arg) {
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	do {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch(ev.type) {
 		case ConfigureRequest:
 		case Expose:
@@ -1469,8 +1469,12 @@ togglefloating(const Arg *arg) {
 
 void
 toggletag(const Arg *arg) {
-	unsigned int mask = sel->tags ^ (arg->ui & TAGMASK);
+	unsigned int mask;
 
+	if (!sel)
+		return;
+	
+	mask = sel->tags ^ (arg->ui & TAGMASK);
 	if(sel && mask) {
 		sel->tags = mask;
 		arrange();