diff options
author | Thomas Adam <thomas@xteddy.org> | 2018-08-18 23:02:40 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2018-08-18 23:02:40 +0100 |
commit | e811132b055914f1b7b58fa14a56cd6664d34f7a (patch) | |
tree | 8aa94d91f018ec4588a948f601fce0c873bcf5c9 /session.c | |
parent | 522d751eee82b45dd508951c713ee9eba9de76ae (diff) | |
parent | bd2896b65e8fd205e3207ed70558d9ebfd106909 (diff) | |
download | rtmux-e811132b055914f1b7b58fa14a56cd6664d34f7a.tar.gz rtmux-e811132b055914f1b7b58fa14a56cd6664d34f7a.tar.bz2 rtmux-e811132b055914f1b7b58fa14a56cd6664d34f7a.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |