circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-08-18 23:02:40 +01:00
parent 522d751eee bd2896b65e
commit e811132b05
7 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
session.c
View File

@ -265,7 +265,7 @@ session_lock_timer(__unused int fd, __unused short events, void *arg)
{
struct session *s = arg;
if (s->flags & SESSION_UNATTACHED)
if (s->attached == 0)
return;
log_debug("session %s locked, activity time %lld", s->name,
@ -298,7 +298,7 @@ session_update_activity(struct session *s, struct timeval *from)
else
evtimer_set(&s->lock_timer, session_lock_timer, s);
if (~s->flags & SESSION_UNATTACHED) {
if (s->attached != 0) {
timerclear(&tv);
tv.tv_sec = options_get_number(s->options, "lock-after-time");
if (tv.tv_sec != 0)