===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/tmux/server-client.c	2009/11/03 20:29:47	1.10
+++ src/usr.bin/tmux/server-client.c	2009/11/03 22:40:40	1.11
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.10 2009/11/03 20:29:47 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.11 2009/11/03 22:40:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -63,6 +63,7 @@
 	
 	if (gettimeofday(&c->creation_time, NULL) != 0)
 		fatal("gettimeofday failed");
+	memcpy(&c->activity_time, &c->creation_time, sizeof c->activity_time);
 
 	ARRAY_INIT(&c->prompt_hdata);
 
@@ -287,6 +288,7 @@
 		oo = &c->session->options;
 
 		/* Update activity timer. */
+		memcpy(&c->activity_time, &tv_now, sizeof c->activity_time);
 		memcpy(&c->session->activity_time,
 		    &tv_now, sizeof c->session->activity_time);
 
@@ -583,9 +585,13 @@
 				break;
 			c->flags &= ~CLIENT_SUSPENDED;
 
-			if (c->session != NULL &&
-			    gettimeofday(&c->session->activity_time, NULL) != 0)
-				fatal("gettimeofday failed");
+			if (gettimeofday(&c->activity_time, NULL) != 0)
+				fatal("gettimeofday");
+			if (c->session != NULL) {
+				memcpy(&c->session->activity_time,
+				    &c->activity_time,
+				    sizeof c->session->activity_time);
+			}
 
 			tty_start_tty(&c->tty);
 			server_redraw_client(c);