Changed: Init CLoginProgressPostThread only if InstallStatsUrl is defined

This commit is contained in:
kervala 2016-01-12 22:31:06 +01:00
parent 8eb174ccb3
commit 175151bcdb

View file

@ -345,21 +345,20 @@ void CLoginProgressPostThread::init(NLMISC::CConfigFile &configFile)
static std::string::size_type httpStrSize = httpStr.size(); static std::string::size_type httpStrSize = httpStr.size();
std::string tmp = configFile.getVarPtr("InstallStatsUrl")->asString(0); std::string tmp = configFile.getVarPtr("InstallStatsUrl")->asString(0);
std::string::size_type it= tmp.find(httpStr); std::string::size_type it= tmp.find(httpStr);
if (it != std::string::npos) if (it == std::string::npos) return;
{
std::string::size_type hostPageSeparator = tmp.find("/", httpStrSize); std::string::size_type hostPageSeparator = tmp.find("/", httpStrSize);
if (hostPageSeparator != std::string::npos) if (hostPageSeparator == std::string::npos) return;
{
installStartupPage = tmp.substr(hostPageSeparator); //keep the leading slash installStartupPage = tmp.substr(hostPageSeparator); //keep the leading slash
installStartupHost = tmp.substr(httpStrSize, hostPageSeparator - httpStrSize); // dont keep the last slah installStartupHost = tmp.substr(httpStrSize, hostPageSeparator - httpStrSize); // dont keep the last slah
}
} init(installStartupHost, installStartupPage);
} }
else else
{ {
nlwarning("Error the InstallStatsUrl is not in the client_default.cfg."); // nlwarning("Error the InstallStatsUrl is not in the client_default.cfg.");
} }
init(installStartupHost, installStartupPage);
} }