oops! stackinit called too many times due to stray ;

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 6ae2fc0..92ea40d 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -1914,8 +1914,9 @@ focus_win(struct ws_win *win)
        else {
                /* use larger hammer since the window was killed somehow */
                TAILQ_FOREACH(cfw, &win->ws->winlist, entry)
-                       XSetWindowBorder(display, cfw->id,
-                           cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
+                       if (cfw->ws && cfw->ws->r && cfw->ws->r->s)
+                               XSetWindowBorder(display, cfw->id,
+                                   cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
        }
 
        win->ws->focus = win;
@@ -2379,7 +2380,7 @@ stack_config(struct swm_region *r, union arg *args)
        if (ws->cur_layout->l_config != NULL)
                ws->cur_layout->l_config(ws, args->id);
 
-       if (args->id != SWM_ARG_ID_STACKINIT);
+       if (args->id != SWM_ARG_ID_STACKINIT)
                stack();
 }