Merge branch 'master' into next

2011-08-24 00:57:36 +02:00
parent b28457f663 16f9c9aee7
commit 642a745004
2 changed files with 18 additions and 1 deletions
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@ -485,7 +485,7 @@ focus:
            int to_focus = $2;
            if ($2 == TOK_MODE_TOGGLE) {
                current = TAILQ_FIRST(&(ws->focus_head));
-                if (current->type == CT_FLOATING_CON)
+                if (current != NULL && current->type == CT_FLOATING_CON)
                    to_focus = TOK_TILING;
                else to_focus = TOK_FLOATING;
            }