mirror of
https://github.com/tmux/tmux.git
synced 2025-09-03 06:17:04 +00:00
Use ctx->client/ctx->session inline instead of temporary variables which were
being reused and causing confusion and problems.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-rename-window.c,v 1.11 2007-11-09 11:02:01 nicm Exp $ */
|
||||
/* $Id: cmd-rename-window.c,v 1.12 2007-11-13 09:53:47 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -94,26 +94,25 @@ void
|
||||
cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx)
|
||||
{
|
||||
struct cmd_rename_window_data *data = ptr;
|
||||
struct client *c = ctx->client;
|
||||
struct session *s = ctx->session;
|
||||
struct winlinks *wwl = &ctx->session->windows;
|
||||
struct winlink *wl;
|
||||
|
||||
if (data == NULL)
|
||||
return;
|
||||
|
||||
if (data->idx == -1)
|
||||
wl = s->curw;
|
||||
else if ((wl = winlink_find_by_index(&s->windows, data->idx)) == NULL) {
|
||||
wl = ctx->session->curw;
|
||||
else if ((wl = winlink_find_by_index(wwl, data->idx)) == NULL) {
|
||||
ctx->error(ctx, "no window %d", data->idx);
|
||||
return;
|
||||
}
|
||||
xfree(wl->window->name);
|
||||
wl->window->name = xstrdup(data->newname);
|
||||
|
||||
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
|
||||
|
Reference in New Issue
Block a user