===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/usr.bin/tmux/server.c	2009/08/31 11:37:27	1.25
+++ src/usr.bin/tmux/server.c	2009/08/31 20:46:19	1.26
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.25 2009/08/31 11:37:27 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.26 2009/08/31 20:46:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -632,6 +632,9 @@
 	if (gettimeofday(&tv, NULL) != 0)
 		fatal("gettimeofday");
 
+	if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >))
+		server_clear_identify(c);
+
 	if (c->message_string != NULL && timercmp(&tv, &c->message_timer, >))
 		status_message_clear(c);
 
@@ -809,6 +812,7 @@
 		wp = c->session->curw->window->active;	/* could die */
 
 		status_message_clear(c);
+		server_clear_identify(c);
 		if (c->prompt_string != NULL) {
 			status_prompt_key(c, key);
 			continue;