===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/usr.bin/tmux/server.c	2009/11/02 12:48:44	1.64
--- src/usr.bin/tmux/server.c	2009/11/03 20:29:47	1.65
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.64 2009/11/02 12:48:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.65 2009/11/03 20:29:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 565,576 ****
  			continue;
  
  		if (s->flags & SESSION_UNATTACHED) {
! 			s->activity = time(NULL);
  			continue;
  		}
  
  		timeout = options_get_number(&s->options, "lock-after-time");
! 		if (timeout <= 0 || t <= s->activity + timeout)
  			return;	/* not timed out */
  	}
  
--- 565,577 ----
  			continue;
  
  		if (s->flags & SESSION_UNATTACHED) {
! 			if (gettimeofday(&s->activity_time, NULL) != 0)
! 				fatal("gettimeofday failed");
  			continue;
  		}
  
  		timeout = options_get_number(&s->options, "lock-after-time");
! 		if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
  			return;	/* not timed out */
  	}
  
***************
*** 593,604 ****
  			continue;
  
  		if (s->flags & SESSION_UNATTACHED) {
! 			s->activity = time(NULL);
  			continue;
  		}
  
  		timeout = options_get_number(&s->options, "lock-after-time");
! 		if (timeout > 0 && t > s->activity + timeout) {
  			server_lock_session(s);
  			recalculate_sizes();
  		}
--- 594,606 ----
  			continue;
  
  		if (s->flags & SESSION_UNATTACHED) {
! 			if (gettimeofday(&s->activity_time, NULL) != 0)
! 				fatal("gettimeofday failed");
  			continue;
  		}
  
  		timeout = options_get_number(&s->options, "lock-after-time");
! 		if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
  			server_lock_session(s);
  			recalculate_sizes();
  		}