mirror of
https://github.com/tmux/tmux.git
synced 2026-10-14 23:34:22 +00:00
Do not use stale pointers in modes.
This commit is contained in:
@@ -254,6 +254,7 @@ window_tree_build_window(struct session *s, struct winlink *wl,
|
||||
u_int n, i;
|
||||
int expanded;
|
||||
struct format_tree *ft;
|
||||
uint64_t tag = FORMAT_NONE;
|
||||
|
||||
item = window_tree_add_item(data);
|
||||
item->type = WINDOW_TREE_WINDOW;
|
||||
@@ -261,7 +262,9 @@ window_tree_build_window(struct session *s, struct winlink *wl,
|
||||
item->winlink = wl->idx;
|
||||
item->pane = -1;
|
||||
|
||||
ft = format_create(NULL, NULL, FORMAT_PANE|wl->window->active->id, 0);
|
||||
if (wl->window != NULL && wl->window->active != NULL)
|
||||
tag = FORMAT_PANE|wl->window->active->id;
|
||||
ft = format_create(NULL, NULL, tag, 0);
|
||||
format_defaults(ft, NULL, s, wl, NULL);
|
||||
text = format_expand(ft, data->format);
|
||||
xasprintf(&name, "%u", wl->idx);
|
||||
@@ -313,6 +316,7 @@ window_tree_build_session(struct session *s, void *modedata,
|
||||
u_int n, i, empty;
|
||||
int expanded;
|
||||
struct format_tree *ft;
|
||||
uint64_t tag = FORMAT_NONE;
|
||||
|
||||
item = window_tree_add_item(data);
|
||||
item->type = WINDOW_TREE_SESSION;
|
||||
@@ -320,7 +324,9 @@ window_tree_build_session(struct session *s, void *modedata,
|
||||
item->winlink = -1;
|
||||
item->pane = -1;
|
||||
|
||||
ft = format_create(NULL, NULL, FORMAT_PANE|wl->window->active->id, 0);
|
||||
if (wl != NULL && wl->window != NULL && wl->window->active != NULL)
|
||||
tag = FORMAT_PANE|wl->window->active->id;
|
||||
ft = format_create(NULL, NULL, tag, 0);
|
||||
format_defaults(ft, NULL, s, NULL, NULL);
|
||||
text = format_expand(ft, data->format);
|
||||
format_free(ft);
|
||||
|
||||
Reference in New Issue
Block a user