From 7e3cc5fd121ff54fbe3e1b9d531cfba63bcf9768 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 13 Nov 2007 09:53:47 +0000 Subject: Use ctx->client/ctx->session inline instead of temporary variables which were being reused and causing confusion and problems. --- cmd-new-window.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'cmd-new-window.c') 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 @@ -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 -- cgit