diff options
| author |   nicm <nicm@openbsd.org> | 2011-01-01 01:12:09 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2011-01-01 01:12:09 +0000 |
| commit | d43b0d5f23fd8fcc44965e52a54c1c108b643527 (patch) | |
| tree | 77441215a4baba7412c968061d99e00c9be8ece7 /usr.bin/tmux/server.c | |
| parent | Remove unused variable. (diff) | |
| download | wireguard-openbsd-d43b0d5f23fd8fcc44965e52a54c1c108b643527.tar.xz wireguard-openbsd-d43b0d5f23fd8fcc44965e52a54c1c108b643527.zip | |
Don't reset the activity timer for unattached sessions every second,
this screws up the choice of most-recently-used. Instead, break the time
update into a little function and do it when the session is attached.
Pointed out by joshe@.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 11b871bbc6a..2d71a474087 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.98 2010/12/30 23:16:18 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.99 2011/01/01 01:12:09 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -494,12 +494,8 @@ server_lock_server(void) t = time(NULL); RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) { - if (gettimeofday(&s->activity_time, NULL) != 0) - fatal("gettimeofday failed"); + if (s->flags & SESSION_UNATTACHED) continue; - } - timeout = options_get_number(&s->options, "lock-after-time"); if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout) return; /* not timed out */ @@ -519,12 +515,8 @@ server_lock_sessions(void) t = time(NULL); RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) { - if (gettimeofday(&s->activity_time, NULL) != 0) - fatal("gettimeofday failed"); + if (s->flags & SESSION_UNATTACHED) continue; - } - timeout = options_get_number(&s->options, "lock-after-time"); if (timeout > 0 && t > s->activity_time.tv_sec + timeout) { server_lock_session(s); |