diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-11 21:31:46 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-11 21:31:46 +0000 |
| commit | 543420ccd2c3c23437405b391e3f9fe1d05223f7 (patch) | |
| tree | 7581f8eb90cd26fd51c5e406f31f561e0e4eb603 /server-fn.c | |
| parent | 064022548bcbf4d45705fdbff8441f2b5da5f682 (diff) | |
| parent | 7c009509676b4580065fdc6f0084a93b9758fac0 (diff) | |
| download | rtmux-543420ccd2c3c23437405b391e3f9fe1d05223f7.tar.gz rtmux-543420ccd2c3c23437405b391e3f9fe1d05223f7.tar.bz2 rtmux-543420ccd2c3c23437405b391e3f9fe1d05223f7.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/server-fn.c b/server-fn.c index b09415e0..566925f0 100644 --- a/server-fn.c +++ b/server-fn.c @@ -39,7 +39,7 @@ server_fill_environ(struct session *s, struct environ *env) term = options_get_string(&s->options, "default-terminal"); environ_set(env, "TERM", term); - idx = s->idx; + idx = s->id; } else idx = -1; pid = getpid(); @@ -546,6 +546,10 @@ server_push_stderr(struct client *c) struct msg_stderr_data data; size_t size; + if (c->stderr_data == c->stdout_data) { + server_push_stdout(c); + return; + } size = EVBUFFER_LENGTH(c->stderr_data); if (size == 0) return; |