diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-09 22:21:29 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-09 22:21:29 +0000 |
| commit | 385a361bf86f95ab40716e58cf364006a5e921d0 (patch) | |
| tree | da66d9ed6f6f37e10d8107bc4d81b588f1f0425e /cmd-respawn-window.c | |
| parent | a24cf4a5e1a6a7309649e5bc11a9d8f9d0cc241b (diff) | |
| parent | c5bdae466e4dad6c185fa5146b11275b6119ff24 (diff) | |
| download | rtmux-385a361bf86f95ab40716e58cf364006a5e921d0.tar.gz rtmux-385a361bf86f95ab40716e58cf364006a5e921d0.tar.bz2 rtmux-385a361bf86f95ab40716e58cf364006a5e921d0.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-respawn-window.c')
| -rw-r--r-- | cmd-respawn-window.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 92ba6299..876fab6a 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -66,11 +66,6 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item) } } - env = environ_create(); - environ_copy(global_environ, env); - environ_copy(s->environ, env); - server_fill_environ(s, env); - wp = TAILQ_FIRST(&w->panes); TAILQ_REMOVE(&w->panes, wp, entry); layout_free(w); @@ -86,6 +81,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item) if (envent != NULL) path = envent->value; + env = environ_for_session(s); if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env, s->tio, &cause) != 0) { cmdq_error(item, "respawn window failed: %s", cause); @@ -94,6 +90,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item) server_destroy_pane(wp, 0); return (CMD_RETURN_ERROR); } + environ_free(env); layout_init(w, wp); window_pane_reset_mode(wp); screen_reinit(&wp->base); @@ -103,6 +100,5 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item) recalculate_sizes(); server_redraw_window(w); - environ_free(env); return (CMD_RETURN_NORMAL); } |