X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=47e9e49f17a01fb8e5ff3f33b5bf7f6d5131f578;hb=81658eaab3a0e1532543ab08a415cab3a044c0dd;hp=5bb6e97348593facf5473ca4737575298580a7a2;hpb=5ad2828c579937afc3dc6da9987587e0eb2473dc;p=dwm.git

diff --git a/layout.c b/layout.c
index 5bb6e97..47e9e49 100644
--- a/layout.c
+++ b/layout.c
@@ -198,11 +198,9 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-		if(i == nlayouts - 1)
-			lt = &layout[0];
-		else
-			lt = &layout[++i];
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
 	}
 	else {
 		i = atoi(arg);
@@ -218,10 +216,8 @@ setlayout(const char *arg) {
 
 void
 togglebar(const char *arg) {
-	if(bpos == BarOff) {
-		if((bpos = BARPOS) == BarOff)
-			bpos = BarTop;
-	}
+	if(bpos == BarOff)
+		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
 	updatebarpos();