Allow manual /motd command even if hide_motd is set.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/irc.c b/src/irc.c
index e2b8afa..5e49d73 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -22,6 +22,7 @@ int msg_argcount;
 
 char irc_away = 0;
 char bell_type;
+char hide_motd;
 
 static char msgbuf[MAX_MSG] = { 0 };
 static char *msg; /* with source removed */
@@ -406,13 +407,14 @@ static void do_numeric(void) {
 
 		case RPL_MOTD:
 			/* FIXME: this prevents the user using /MOTD on purpose, too */
-			if(!conf->hide_motd)
+			if(!hide_motd)
 				do_catchall(0);
 			break;
 
 		/* don't print, but do trigger rejoin */
 		case RPL_ENDOFMOTD:
 		case ERR_NOMOTD:
+			hide_motd = 0;
 			cmd_rejoin_chans();
 			break;
 
@@ -899,6 +901,7 @@ static void keystroke(void) {
 
 /* only exits on error (e.g. connection closed, which might be via /QUIT). */
 void irc_loop(void) {
+	hide_motd = conf->hide_motd;
 	while(1) {
 		if(conf->atract_away) {
 			if(!irc_away && (OS.atract & 0x80)) {