1 files changed, 3 insertions, 2 deletions
diff --git a/src/irc.c b/src/irc.c
index 6f6b2f0..ad3d214 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -730,7 +730,6 @@ int irc_read(void) {
 
 	if(err != 1) {
 		scr_display(SCR_SERVER);
-		regged = irc_away = 0;
 		ind_net_down();
 		if(err == 136) {
 			scr_print_current("Disconnected");
@@ -1023,9 +1022,12 @@ static void keystroke(void) {
 
 /* only exits on error (e.g. connection closed, which might be via /QUIT). */
 void irc_loop(void) {
+	/* this stuff happens on every connect. */
 	hide_motd = conf->hide_motd;
 	minutes = 0;
 	start_minute_timer();
+	msgbuf[0] = msgbuf_len = regged = irc_away = 0;
+
 	while(1) {
 		ind_check_timer();
 		if(conf->atract_away) {
@@ -1035,7 +1037,6 @@ void irc_loop(void) {
 			}
 		}
 		if(!irc_read() || !service_minute_timer()) {
-			regged = 0;
 			return;
 		}
 		keystroke();