early return

Author: Fernando-A-Rocha

Server/mods/deathmatch/logic/CMainConfig.cpp

@@ -133,20 +133,18 @@ bool CMainConfig::Load()
         return false;
     }
 
-    // Strip spaces from beginning and end of server name
+    // Cancel if the server name only contains spaces
     const size_t snameStart = m_strServerName.find_first_not_of(" ");
-    if (snameStart != std::string::npos)
-    {
-        const size_t snameEnd = m_strServerName.find_last_not_of(" ");
-        m_strServerName = m_strServerName.substr(snameStart, snameEnd - snameStart + 1);
-    }
-    else
+    if (snameStart == std::string::npos)
     {
-        // The string contains only spaces
         CLogger::ErrorPrintf("Server name must contain at least one character other than a space\n");
         return false;
     }
 
+    // Strip spaces from beginning and end of server name
+    const size_t snameEnd = m_strServerName.find_last_not_of(" ");
+    m_strServerName = m_strServerName.substr(snameStart, snameEnd - snameStart + 1);
+
     // Grab the forced server ip(s)
     GetString(m_pRootNode, "serverip", m_strServerIP);
     m_strServerIP = SString(m_strServerIP).Replace(" ", "");