Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-12-23 02:01:14 +00:00
commit ed65535c41

View File

@ -90,10 +90,9 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq_error(cmdq, "can't find last session");
return (CMD_RETURN_ERROR);
}
} else {
if (cmdq->client == NULL)
return (CMD_RETURN_NORMAL);
s = state->tflag.s;
if (state->tflag.wl != NULL) {
wp = state->tflag.wp;
if (wp != NULL)