From 8da8090a8f2636ee71f3f637a083836cc1fe22cf Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 26 Oct 2018 03:40:25 +0000
Subject: [PATCH] If the system is configure to not ask new user's if they have
 a color display, don't ask Guests (during logon) either. Removed some more
 WIP and HTMLterm support. Remove a couple unnecessary if
 (text[somethingQ][0]) checks.

---
 src/sbbs3/logon.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index e6e5738fc4..2a8708e164 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -79,14 +79,14 @@ bool sbbs_t::logon()
 	if(useron.rest&FLAG('G')) {     /* Guest account */
 		useron.misc=(cfg.new_misc&(~ASK_NSCAN));
 		useron.rows=0;
-		useron.misc&=~(ANSI|RIP|WIP|NO_EXASCII|COLOR|HTML|PETSCII);
+		useron.misc&=~(ANSI|RIP|NO_EXASCII|COLOR|PETSCII);
 		useron.misc|=autoterm;
 		if(!(useron.misc&(ANSI|PETSCII)) && text[AnsiTerminalQ][0] && yesno(text[AnsiTerminalQ]))
 			useron.misc|=ANSI;
-		if(useron.misc&(RIP|WIP|HTML)
-			|| (useron.misc&(ANSI|PETSCII) && text[ColorTerminalQ][0] && yesno(text[ColorTerminalQ])))
+		if((useron.misc&RIP) || !(cfg.uq&UQ_COLORTERM)
+			|| (useron.misc&(ANSI|PETSCII) && yesno(text[ColorTerminalQ])))
 			useron.misc|=COLOR;
-		if(!(useron.misc&(NO_EXASCII|PETSCII)) && text[ExAsciiTerminalQ][0] && !yesno(text[ExAsciiTerminalQ]))
+		if(!(useron.misc&(NO_EXASCII|PETSCII)) && !yesno(text[ExAsciiTerminalQ]))
 			useron.misc|=NO_EXASCII;
 		for(i=0;i<cfg.total_xedits;i++)
 			if(!stricmp(cfg.xedit[i]->code,cfg.new_xedit)
@@ -175,7 +175,7 @@ bool sbbs_t::logon()
 
 
 	if(useron.misc&AUTOTERM) {
-		useron.misc&=~(ANSI|RIP|WIP|HTML|PETSCII);
+		useron.misc&=~(ANSI|RIP|PETSCII);
 		useron.misc|=autoterm;
 	}
 
-- 
GitLab