diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:50:05 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:51:21 +0000 |
| commit | 35ffd093d724053046ae49984af0beb0530e5560 (patch) | |
| tree | d5b89a213621dc56b852fc7eb8a1daba12046830 /server-client.c | |
| parent | 201036ad80f2e51f7238db2adf05914a4a4f5819 (diff) | |
| parent | 10a9440055ccdda5788965bcb048207eab2a0548 (diff) | |
| download | rtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.gz rtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.bz2 rtmux-35ffd093d724053046ae49984af0beb0530e5560.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-link-window.c
cmd-unlink-window.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index 1942926b..6b3ba8ca 100644 --- a/server-client.c +++ b/server-client.c @@ -159,7 +159,7 @@ server_client_lost(struct client *c) evbuffer_free(c->stdin_data); evbuffer_free(c->stdout_data); if (c->stderr_data != c->stdout_data) - evbuffer_free (c->stderr_data); + evbuffer_free(c->stderr_data); status_free_jobs(&c->status_new); status_free_jobs(&c->status_old); @@ -647,7 +647,7 @@ server_client_reset_state(struct client *c) if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status) tty_cursor(&c->tty, 0, 0); else { - o = status && options_get_number (oo, "status-position") == 0; + o = status && options_get_number(oo, "status-position") == 0; tty_cursor(&c->tty, wp->xoff + s->cx, o + wp->yoff + s->cy); } |