wmii

commit 88c123d1b45233a998b93bd07d0c03e5b3efe973
parent 2b525e6b8f33c1ac0ec05aec4afc685d79201e73
Author: Denis Grelich <denisg@suckless.org>
Date:   Wed,  7 Feb 2007 18:32:57 +0100

merge

Diffstat:
draw.c
 | 
3
++-
mouse.c
 | 
6
++++--

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/draw.c b/draw.c
@@ -58,7 +58,8 @@ loadfont(Blitz *blitz, BlitzFont *font) {
 						BLITZ_FONT);
 			free(font->fontstr);
 			font->fontstr = ixp_estrdup(BLITZ_FONT);
-			return loadfont(blitz, font);
+			loadfont(blitz, font);
+			return;
 		}
 		font->ascent = font->xfont->ascent;
 		font->descent = font->xfont->descent;
diff --git a/mouse.c b/mouse.c
@@ -330,8 +330,10 @@ do_mouse_resize(Client *c, BlitzAlign align) {
 	snap = floating ? screen->rect.height / 66 : 0;
 	cur = cursor[CurResize];
 	
-	if(!floating && (align == CENTER))
-		return do_managed_move(c);
+	if(!floating && (align == CENTER)) {
+		do_managed_move(c);
+		return;
+	}
 
 	XQueryPointer(blz.dpy, c->framewin, &dummy, &dummy, &i, &i, &pt_x, &pt_y, &di);
 	rx = (float)pt_x / frect.width;