tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enhance losing session while power outrages remedy 

Fix possible session backup swapping when no session.xml file.
The ReplaceFile WINAPI failed when the session.xml file replaced did not exist.

This commit follows the commit aa3777786d

Close #14887
This commit is contained in:
xomx 2024-03-20 21:55:06 +01:00 committed by Don Ho
parent 0bc28df616
commit 109600aa50
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PowerEditor/src/Parameters.cpp
View File

@ -1587,24 +1587,39 @@ bool NppParameters::load()
sessionInCaseOfCorruption_bak += SESSION_BACKUP_EXT;
if (::PathFileExists(sessionInCaseOfCorruption_bak.c_str()))
{
ReplaceFile(_sessionPath.c_str(), sessionInCaseOfCorruption_bak.c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS | REPLACEFILE_IGNORE_ACL_ERRORS, 0, 0);
BOOL bFileSwapOk = false;
if (::PathFileExists(_sessionPath.c_str()))
{
// an invalid session.xml file exists
bFileSwapOk = ::ReplaceFile(_sessionPath.c_str(), sessionInCaseOfCorruption_bak.c_str(), nullptr,
REPLACEFILE_IGNORE_MERGE_ERRORS | REPLACEFILE_IGNORE_ACL_ERRORS, 0, 0);
}
else
{
// no session.xml file
bFileSwapOk = ::MoveFileEx(sessionInCaseOfCorruption_bak.c_str(), _sessionPath.c_str(),
MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH);
}
TiXmlDocument* pXmlSessionBackupDoc = new TiXmlDocument(_sessionPath);
loadOkay = pXmlSessionBackupDoc->LoadFile();
if (loadOkay)
loadOkay = getSessionFromXmlTree(pXmlSessionBackupDoc, _session);
if (bFileSwapOk)
{
TiXmlDocument* pXmlSessionBackupDoc = new TiXmlDocument(_sessionPath);
loadOkay = pXmlSessionBackupDoc->LoadFile();
if (loadOkay)
loadOkay = getSessionFromXmlTree(pXmlSessionBackupDoc, _session);
delete pXmlSessionBackupDoc;
delete pXmlSessionBackupDoc;
}
if (!loadOkay)
isAllLoaded = false;
isAllLoaded = false; // either the backup file is also invalid or cannot be swapped with the session.xml
}
else
{
// no backup file
isAllLoaded = false;
}
}
delete pXmlSessionDoc;