===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- src/usr.bin/tmux/tty.c	2023/04/25 09:31:50	1.430
+++ src/usr.bin/tmux/tty.c	2023/06/26 07:17:40	1.431
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.430 2023/04/25 09:31:50 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.431 2023/06/26 07:17:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -483,6 +483,12 @@
 	if (tty->term->flags & TERM_VT100LIKE)
 		tty_puts(tty, "\033[?7727h");
 
+	/*
+	 * Features might have changed since the first draw during attach. For
+	 * example, this happens when DA responses are received.
+	 */
+	server_redraw_client(c);
+
 	tty_invalidate(tty);
 }
 
@@ -2808,9 +2814,10 @@
 			gc->us = c;
 	}
 
-	/* Underscore colour is set as RGB so convert a 256 colour to RGB. */
-	if (gc->us & COLOUR_FLAG_256)
-		gc->us = colour_256toRGB (gc->us);
+	/* Underscore colour is set as RGB so convert. */
+	gc->us = colour_force_rgb (gc->us);
+	if (gc->us == -1)
+		gc->us = 8;
 }
 
 static void