X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=04ae223b9375edaf231918f3098157f06f1b96c0;hb=d662f98d89d3e813344e9bdb64e5704caf3b9dc2;hp=1c52d805466ebaaf5e1c50ff7b74cc7e8462070b;hpb=c56533615f84df801f10dedc4d6ff267e0e8df0a;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 1c52d80..04ae223 100644
--- a/dwm.c
+++ b/dwm.c
@@ -363,8 +363,11 @@ checkotherwm(void) {
 void
 cleanup(void) {
 	Arg a = {.i = ~0};
+	Layout foo = { "", NULL };
+
 	close(STDIN_FILENO);
 	view(&a);
+	lt = &foo;
 	while(stack)
 		unmanage(stack);
 	if(dc.font.set)
@@ -1476,7 +1479,9 @@ togglefloating(const Arg *arg) {
 
 void
 togglelayout(const Arg *arg) {
-	if(++lt == &layouts[LENGTH(layouts)])
+	if(arg->v)
+		lt = (Layout *)arg->v;
+	else if(++lt == &layouts[LENGTH(layouts)])
 		lt = &layouts[0];
 	if(sel)
 		arrange();