C4ChatDlg: Restore StdStrBuf for new title setting and add extra code…

… to protect against a null title
legacyclonk · Nov 30, 2024 · bd6fcff · bd6fcff
1 parent 8c1ef1a
commit bd6fcff
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/C4ChatDlg.cpp b/src/C4ChatDlg.cpp
@@ -856,25 +856,28 @@ C4ChatControl::ChatSheet *C4ChatControl::OpenQuery(const char *szForNick, bool f
 
 void C4ChatControl::UpdateTitle()
 {
-	std::string newTitle;
+	StdStrBuf sNewTitle;
 	if (pTabMain->GetActiveSheetIndex() == 0)
 	{
 		// login title
-		newTitle = LoadResStr(C4ResStrTableKey::IDS_CHAT_NOTCONNECTED);
+		const std::string notConnected{LoadResStr(C4ResStrTableKey::IDS_CHAT_NOTCONNECTED)};
+		sNewTitle.Copy(notConnected.c_str(), notConnected.size());
 	}
 	else
 	{
 		// login by active sheet
 		ChatSheet *pActiveSheet = GetActiveChatSheet();
 		if (pActiveSheet)
 		{
-			newTitle = pActiveSheet->GetChatTitle();
+			sNewTitle = pActiveSheet->GetChatTitle();
 		}
+		else
+			sNewTitle = "";
 	}
 	// call update proc only if title changed
-	if (sTitle.isNull() || newTitle.compare(sTitle.getData()))
+	if (sTitle != sNewTitle)
 	{
-		sTitle.Copy(newTitle.c_str());
+		sTitle.Take(sNewTitle);
 		if (pTitleChangeBC) pTitleChangeBC->OnOK(sTitle);
 	}
 }
@@ -1137,5 +1140,5 @@ void C4ChatDlg::UpdateSize()
 
 void C4ChatDlg::OnChatTitleChange(const StdStrBuf &sNewTitle)
 {
-	SetTitle(std::format("{} - {}", LoadResStr(C4ResStrTableKey::IDS_DLG_CHAT), sNewTitle.getData()).c_str());
+	SetTitle(std::format("{} - {}", LoadResStr(C4ResStrTableKey::IDS_DLG_CHAT), sNewTitle.isNull() ? "(null)" : sNewTitle.getData()).c_str());
 }