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

Use temporary file when saving editor file (fixes #4476)

Browse source
This commit is contained in:
def 2021-12-20 10:54:46 +01:00
parent 3013466b86
commit e2084e1e9d
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game/editor/io.cpp
View file

@ -221,13 +221,15 @@ int CEditor::Save(const char *pFilename)
int CEditorMap::Save(class IStorage *pStorage, const char *pFileName) int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
{ {
char aBuf[256]; char aFileNameTmp[IO_MAX_PATH_LENGTH];
str_format(aBuf, sizeof(aBuf), "saving to '%s'...", pFileName); str_format(aFileNameTmp, sizeof(aFileNameTmp), "%s.%d.tmp", pFileName, pid());
char aBuf[IO_MAX_PATH_LENGTH];
str_format(aBuf, sizeof(aBuf), "saving to '%s'...", aFileNameTmp);
m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf); m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
CDataFileWriter df; CDataFileWriter df;
if(!df.Open(pStorage, pFileName)) if(!df.Open(pStorage, aFileNameTmp))
{ {
str_format(aBuf, sizeof(aBuf), "failed to open file '%s'...", pFileName); str_format(aBuf, sizeof(aBuf), "failed to open file '%s'...", aFileNameTmp);
m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf); m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
return 0; return 0;
} }
@ -553,6 +555,13 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
df.Finish(); df.Finish();
m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving done"); m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving done");
str_format(aBuf, sizeof(aBuf), "moving '%s' to '%s'", aFileNameTmp, pFileName);
m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", aBuf);
if(!pStorage->RenameFile(aFileNameTmp, pFileName, IStorage::TYPE_SAVE))
{
return 0;
}
// send rcon.. if we can // send rcon.. if we can
if(m_pEditor->Client()->RconAuthed()) if(m_pEditor->Client()->RconAuthed())
{ {