X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=971098918efa6e23d74f411f4b3af79b674db6cd;hb=895902b57adbfe26f982a3eb4e2ee8f3aa4dd408;hp=f2686236d9d0ff92b2d49677ff38fa6964a03843;hpb=b79b5facb104a653314577bb7f15824396b9e94b;p=dwm.git

diff --git a/client.c b/client.c
index f268623..9710989 100644
--- a/client.c
+++ b/client.c
@@ -49,6 +49,8 @@ ban(Client *c)
 void
 focus(Client *c)
 {
+	if (!issel)
+		return;
 	Client *old = sel;
 	XEvent ev;
 
@@ -409,7 +411,7 @@ togglemax(Arg *arg)
 		sel->h = sh - 2 - bh;
 
 		higher(sel);
-		resize(sel, False, TopLeft);
+		resize(sel, arrange == dofloat, TopLeft);
 
 		sel->x = ox;
 		sel->y = oy;
@@ -436,13 +438,8 @@ unmanage(Client *c)
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
-	if(sel == c) {
-		sel = getnext(c->next);
-		if(!sel)
-			sel = getprev(c->prev);
-		if(!sel)
-			sel = clients;
-	}
+	if(sel == c)
+		sel = getnext(clients);
 	free(c->tags);
 	free(c);
 
@@ -459,7 +456,7 @@ zoom(Arg *arg)
 {
 	Client *c;
 
-	if(!sel || (arrange != dotile) || sel->isfloat)
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
 
 	if(sel == getnext(clients))  {
@@ -470,13 +467,11 @@ zoom(Arg *arg)
 	}
 
 	/* pop */
-	if(sel->prev)
-		sel->prev->next = sel->next;
+	sel->prev->next = sel->next;
 	if(sel->next)
 		sel->next->prev = sel->prev;
 	sel->prev = NULL;
-	if(clients)
-		clients->prev = sel;
+	clients->prev = sel;
 	sel->next = clients;
 	clients = sel;
 	arrange(NULL);