Merge branch 'master' into radar-jpg-update

Fernando-A-Rocha · web-flow · commit 905ac0cccb54 · 2024-10-26T01:17:10.000+01:00
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -133,6 +133,9 @@ bool CMainConfig::Load()
         return false;
     }
 
+    // Strip spaces from beginning and end of server name
+    m_strServerName = SString(m_strServerName).TrimStart(" ").TrimEnd(" ");
+
     // Grab the forced server ip(s)
     GetString(m_pRootNode, "serverip", m_strServerIP);
     m_strServerIP = SString(m_strServerIP).Replace(" ", "");

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@ bool CMainConfig::Load()`
`133`	`133`	`return false;`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ // Strip spaces from beginning and end of server name`
	`137`	`+ m_strServerName = SString(m_strServerName).TrimStart(" ").TrimEnd(" ");`
	`138`	`+`
`136`	`139`	`// Grab the forced server ip(s)`
`137`	`140`	`GetString(m_pRootNode, "serverip", m_strServerIP);`
`138`	`141`	`m_strServerIP = SString(m_strServerIP).Replace(" ", "");`