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-client.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-client.c')
| -rw-r--r-- | server-client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index b905a7c7..77e6de78 100644 --- a/server-client.c +++ b/server-client.c @@ -153,7 +153,8 @@ server_client_lost(struct client *c) evbuffer_free (c->stdin_data); evbuffer_free (c->stdout_data); - evbuffer_free (c->stderr_data); + if (c->stderr_data != c->stdout_data) + evbuffer_free (c->stderr_data); status_free_jobs(&c->status_new); status_free_jobs(&c->status_old); @@ -955,6 +956,8 @@ server_client_msg_identify( if (data->flags & IDENTIFY_CONTROL) { c->stdin_callback = control_callback; + evbuffer_free(c->stderr_data); + c->stderr_data = c->stdout_data; c->flags |= CLIENT_CONTROL; if (data->flags & IDENTIFY_TERMIOS) evbuffer_add_printf(c->stdout_data, "\033P1000p"); |