===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- src/usr.bin/tmux/status.c	2016/10/12 14:50:14	1.155
+++ src/usr.bin/tmux/status.c	2016/12/07 23:03:04	1.156
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.155 2016/10/12 14:50:14 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.156 2016/12/07 23:03:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -554,7 +554,6 @@
 
 	limit = options_get_number(global_options, "message-limit");
 
-	status_prompt_clear(c);
 	status_message_clear(c);
 
 	va_start(ap, fmt);
@@ -600,7 +599,8 @@
 	free(c->message_string);
 	c->message_string = NULL;
 
-	c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
+	if (c->prompt_string == NULL)
+		c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
 	c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */
 
 	screen_reinit(&c->status);