summaryrefslogtreecommitdiffstats
path: root/cmd-new-window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-11-13 09:53:47 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-11-13 09:53:47 +0000
commit7e3cc5fd121ff54fbe3e1b9d531cfba63bcf9768 (patch)
tree547d9b577f641c38b63eaa35adba0756624da368 /cmd-new-window.c
parent89d298d4c7cf61c3ba8674ecf07c19ffbbb4dc13 (diff)
Use ctx->client/ctx->session inline instead of temporary variables which were
being reused and causing confusion and problems.
Diffstat (limited to 'cmd-new-window.c')
-rw-r--r--cmd-new-window.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/cmd-new-window.c b/cmd-new-window.c
index 094d877e..ebb434c9 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-window.c,v 1.11 2007-10-26 16:57:32 nicm Exp $ */
+/* $Id: cmd-new-window.c,v 1.12 2007-11-13 09:53:47 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -106,8 +106,6 @@ cmd_new_window_exec(void *ptr, struct cmd_ctx *ctx)
{
struct cmd_new_window_data *data = ptr;
struct cmd_new_window_data std = { NULL, NULL, -1, 0 };
- struct client *c = ctx->client;
- struct session *s = ctx->session;
struct winlink *wl;
char *cmd;
@@ -120,18 +118,19 @@ cmd_new_window_exec(void *ptr, struct cmd_ctx *ctx)
if (data->idx < 0)
data->idx = -1;
- if ((wl = session_new(s, data->name, cmd, data->idx)) == NULL) {
+ wl = session_new(ctx->session, data->name, cmd, data->idx);
+ if (wl == NULL) {
ctx->error(ctx, "command failed: %s", cmd);
return;
}
if (!data->flag_detached) {
- session_select(s, wl->idx);
- server_redraw_session(s);
+ session_select(ctx->session, wl->idx);
+ server_redraw_session(ctx->session);
} else
- server_status_session(s);
+ server_status_session(ctx->session);
if (!(ctx->flags & CMD_KEY))
- server_write_client(c, MSG_EXIT, NULL, 0);
+ server_write_client(ctx->client, MSG_EXIT, NULL, 0);
}
void