Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-26 22:25:06 +00:00
commit 1a3b82eb02
1 changed files with 5 additions and 4 deletions

View File

@ -420,11 +420,12 @@ void init_ws_for_output(Output *output, Con *content) {
continue; continue;
DLOG("relevant command = %s\n", bind->command); DLOG("relevant command = %s\n", bind->command);
char *target = bind->command + strlen("workspace "); char *target = bind->command + strlen("workspace ");
/* We check if this is the workspace next/prev command. Beware: The /* We check if this is the workspace next/prev/back_and_forth command.
* workspace names "next" and "prev" are OK, so we check before * Beware: The workspace names "next", "prev" and "back_and_forth" are
* stripping the double quotes */ * OK, so we check before stripping the double quotes */
if (strncasecmp(target, "next", strlen("next")) == 0 || if (strncasecmp(target, "next", strlen("next")) == 0 ||
strncasecmp(target, "prev", strlen("prev")) == 0) strncasecmp(target, "prev", strlen("prev")) == 0 ||
strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0)
continue; continue;
if (*target == '"') if (*target == '"')
target++; target++;