Don't clear chat on setting structure limits.

Fixes ticket:4276.
Warzone2100 · Jun 25, 2016 · a10dc95 · a10dc95
1 parent 6744ea2
commit a10dc95
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/frontend.cpp b/src/frontend.cpp
@@ -1799,14 +1799,7 @@ void changeTitleMode(tMode mode)
 		startConnectionScreen();
 		break;
 	case MULTIOPTION:
-		if (oldMode == MULTILIMIT)
-		{
-			startMultiOptions(true);
-		}
-		else
-		{
-			startMultiOptions(false);
-		}
+		startMultiOptions(oldMode == MULTILIMIT);
 		break;
 	case GAMEFIND:
 		startGameFind();

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -186,7 +186,7 @@ static void showPasswordForm(void);
 
 // Game option functions
 static	void	addGameOptions();
-static	void	addChatBox(void);
+static void addChatBox(bool preserveOldChat = false);
 static void		addConsoleBox(void);
 static	void	disableMultiButs(void);
 static	void	processMultiopWidgets(UDWORD);
@@ -2596,7 +2596,7 @@ void kickPlayer(uint32_t player_id, const char *reason, LOBBY_ERROR_TYPES type)
 	NETplayerKicked(player_id);
 }
 
-static void addChatBox(void)
+static void addChatBox(bool preserveOldChat)
 {
 	if (widgGetFromID(psWScreen, FRONTEND_TOPFORM))
 	{
@@ -2616,13 +2616,16 @@ static void addChatBox(void)
 
 	addSideText(FRONTEND_SIDETEXT4, MULTIOP_CHATBOXX - 3, MULTIOP_CHATBOXY, _("CHAT"));
 
-	flushConsoleMessages();											// add the chatbox.
-	initConsoleMessages();
+	if (!preserveOldChat)
+	{
+		flushConsoleMessages();  // add the chatbox.
+		initConsoleMessages();
+		setConsoleBackdropStatus(false);
+		setConsoleSizePos(MULTIOP_CHATBOXX + 4 + D_W, MULTIOP_CHATBOXY + 14 + D_H, MULTIOP_CHATBOXW - 4);
+		setConsolePermanence(true, true);
+		setConsoleLineInfo(5);  // use x lines on chat window
+	}
 	enableConsoleDisplay(true);
-	setConsoleBackdropStatus(false);
-	setConsoleSizePos(MULTIOP_CHATBOXX + 4 + D_W, MULTIOP_CHATBOXY + 14 + D_H, MULTIOP_CHATBOXW - 4);
-	setConsolePermanence(true, true);
-	setConsoleLineInfo(5);											// use x lines on chat window
 
 	W_EDBINIT sEdInit;                                                                                      // add the edit box
 	sEdInit.formID = MULTIOP_CHATBOX;
@@ -3867,7 +3870,7 @@ bool startMultiOptions(bool bReenter)
 	{
 		addPlayerBox(false);								// Players
 		addGameOptions();
-		addChatBox();
+		addChatBox(bReenter);
 
 		if (ingame.bHostSetup)
 		{
@@ -3903,7 +3906,7 @@ bool startMultiOptions(bool bReenter)
 			{
 				ssprintf(buf, _("Hit the ready box to begin your challenge!"));
 			}
-			else
+			else if (!bHosted)
 			{
 				ssprintf(buf, _("Press the start hosting button to begin hosting a game."));
 			}