Merge branch 'master' into next

2011-11-26 22:18:01 +00:00
parent 340592a532 79dda6e57b
commit f5dce848b8
2 changed files with 25 additions and 0 deletions
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@ -450,6 +450,10 @@ focus:
        int count = 0;
        TAILQ_FOREACH(current, &owindows, owindows) {
            Con *ws = con_get_workspace(current->con);
+            /* If no workspace could be found, this was a dock window.
+             * Just skip it, you cannot focus dock windows. */
+            if (!ws)
+                continue;

            /* If the container is not on the current workspace,
             * workspace_show() will switch to a different workspace and (if