From db1343f2ec8d3b944e861fb40593d96be4ec5dda Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Mon, 23 Mar 2026 02:04:36 -0400
Subject: Error messages (numerics 400 to 599) go to the current screen, not
 [server].

---
 src/irc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/irc.c')

diff --git a/src/irc.c b/src/irc.c
index cafd0a0..00ec89a 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -443,11 +443,13 @@ static void do_numeric(void) {
 		*/
 
 		case ERR_NICKNAMEINUSE:
-			do_catchall(0);
-			if(!regged) {
+			if(regged) {
+				scr_activate(scr_current);
+			} else {
 				permute_nick();
 				send_nick();
 			}
+			do_catchall(1);
 			break;
 
 		/* don't print these, just noise */
@@ -501,6 +503,8 @@ static void do_numeric(void) {
 			break;
 
 		default:
+			if(num >= 400 && num < 600)
+				scr_activate(scr_current);
 			do_catchall(1);
 			break;
 	}
-- 
cgit v1.2.3