diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-04-28 10:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-04-28 10:01:10 +0100 |
| commit | 7a02910feb9cea4006a0b9a925c3f6cc7984db3b (patch) | |
| tree | 8dd04f12cda07f5edcbf6ad0c301399034b0abeb /server-client.c | |
| parent | bac7a68023adf01c0afdb70ac954f7b3cb7c3032 (diff) | |
| parent | dd8ba0b5a8f48d4946f0ed214f189bc7092d5b07 (diff) | |
| download | rtmux-7a02910feb9cea4006a0b9a925c3f6cc7984db3b.tar.gz rtmux-7a02910feb9cea4006a0b9a925c3f6cc7984db3b.tar.bz2 rtmux-7a02910feb9cea4006a0b9a925c3f6cc7984db3b.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index b0615bba..26425c8f 100644 --- a/server-client.c +++ b/server-client.c @@ -1098,12 +1098,13 @@ server_client_dispatch(struct imsg *imsg, void *arg) if (gettimeofday(&c->activity_time, NULL) != 0) fatal("gettimeofday failed"); - if (s != NULL) - session_update_activity(s, &c->activity_time); tty_start_tty(&c->tty); server_redraw_client(c); recalculate_sizes(); + + if (s != NULL) + session_update_activity(s, &c->activity_time); break; case MSG_SHELL: if (datalen != 0) |