Merge branch 'obsd-master'

Conflicts:
	tmux.c
This commit is contained in:
Thomas Adam
2013-04-13 17:05:49 +01:00
16 changed files with 57 additions and 107 deletions

View File

@ -158,7 +158,7 @@ cmdq_guard(struct cmd_q *cmdq, const char *guard)
{
struct client *c = cmdq->client;
if (c == NULL || c->session == NULL)
if (c == NULL)
return 0;
if (!(c->flags & CLIENT_CONTROL))
return 0;