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

Merge pull request #7772 from Robyt3/Config-Save-Error-Improvements

Browse source 
Improve error messages when saving settings fails
This commit is contained in:
Dennis Felsing 2024-01-07 13:55:38 +00:00 committed by GitHub
parent fda996014b a80d875e85
commit d6c10233ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/client.cpp
View file

@ -2997,7 +2997,11 @@ void CClient::Run()
{
// write down the config and quit
if(!m_pConfigManager->Save())
m_vWarnings.emplace_back(Localize("Saving ddnet-settings.cfg failed"));
{
char aWarning[128];
str_format(aWarning, sizeof(aWarning), Localize("Saving settings to '%s' failed"), CONFIG_FILE);
m_vWarnings.emplace_back(aWarning);
}
s_SavedConfig = true;
}

10
src/engine/shared/config.cpp
View file

@ -496,19 +496,27 @@ bool CConfigManager::Save()
WriteLine(pCommand);
}
if(m_Failed)
{
log_error("config", "ERROR: writing to %s failed", aConfigFileTmp);
}
if(io_sync(m_ConfigFile) != 0)
{
m_Failed = true;
log_error("config", "ERROR: synchronizing %s failed", aConfigFileTmp);
}
if(io_close(m_ConfigFile) != 0)
{
m_Failed = true;
log_error("config", "ERROR: closing %s failed", aConfigFileTmp);
}
m_ConfigFile = 0;
if(m_Failed)
{
log_error("config", "ERROR: writing to %s failed", aConfigFileTmp);
return false;
}