aboutsummaryrefslogtreecommitdiff
path: root/cmd-attach-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-04-05 12:36:14 +0100
committerThomas Adam <thomas@xteddy.org>2014-04-05 12:36:14 +0100
commit0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch)
tree852fa9fde3126091fa90ee6604097373076772b1 /cmd-attach-session.c
parent806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff)
parentacef311fe356f408690e9f94727ed63a934b742f (diff)
downloadrtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz
rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2
rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip
Merge branch 'obsd-master'
Conflicts: Makefile tty-keys.c
Diffstat (limited to 'cmd-attach-session.c')
-rw-r--r--cmd-attach-session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 8094d78b..17c932e6 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -132,7 +132,7 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
server_redraw_client(cmdq->client);
s->curw->flags &= ~WINLINK_ALERTFLAGS;
} else {
- if (server_client_open(cmdq->client, s, &cause) != 0) {
+ if (server_client_open(cmdq->client, &cause) != 0) {
cmdq_error(cmdq, "open terminal failed: %s", cause);
free(cause);
return (CMD_RETURN_ERROR);