edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8112 from heinrich5991/pr_ddnet_http_age_crash

Browse source 
Fix crash when the serverlist request fails
This commit is contained in:
Robert Müller 2024-03-16 22:40:48 +00:00 committed by GitHub
parent b72d89b5cf f3c246f622
commit acfe26e715
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engine/client/serverbrowser_http.cpp
View file

@ -400,21 +400,24 @@ void CServerBrowserHttp::Update()
Success = Success && pJson; Success = Success && pJson;
Success = Success && !Parse(pJson, &m_vServers, &m_vLegacyServers); Success = Success && !Parse(pJson, &m_vServers, &m_vLegacyServers);
json_value_free(pJson); json_value_free(pJson);
int Age = SanitizeAge(pGetServers->ResultAgeSeconds());
if(!Success) if(!Success)
{ {
log_error("serverbrowser_http", "failed getting serverlist, trying to find best URL"); log_error("serverbrowser_http", "failed getting serverlist, trying to find best URL");
m_pChooseMaster->Reset(); m_pChooseMaster->Reset();
m_pChooseMaster->Refresh(); m_pChooseMaster->Refresh();
} }
// Try to find new master if the current one returns results else
// that are 5 minutes old. {
else if(Age > 300) // Try to find new master if the current one returns
// results that are 5 minutes old.
int Age = SanitizeAge(pGetServers->ResultAgeSeconds());
if(Age > 300)
{ {
log_info("serverbrowser_http", "got stale serverlist, age=%ds, trying to find best URL", Age); log_info("serverbrowser_http", "got stale serverlist, age=%ds, trying to find best URL", Age);
m_pChooseMaster->Refresh(); m_pChooseMaster->Refresh();
} }
} }
}
} }
void CServerBrowserHttp::Refresh() void CServerBrowserHttp::Refresh()
{ {