Merge branch 'obsd-master'

Conflicts:
	Makefile
	tty-keys.c
This commit is contained in:
Thomas Adam
2014-04-05 12:36:14 +01:00
19 changed files with 166 additions and 100 deletions

View File

@@ -145,7 +145,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
/* Open the terminal if necessary. */
if (!detached && !already_attached) {
if (server_client_open(c, NULL, &cause) != 0) {
if (server_client_open(c, &cause) != 0) {
cmdq_error(cmdq, "open terminal failed: %s", cause);
free(cause);
goto error;