tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-09-14 13:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on exit after creating or importing a UDL

Browse Source 
And fix deletion userDefineLang.xml file bug on exit.
This commit is contained in:
Don HO 2019-02-09 22:52:13 +01:00
parent 58037e07b1
commit 494b4bc0db
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PowerEditor/src/Parameters.cpp
View File

@ -2888,14 +2888,17 @@ Default UDL + Created + Imported
void NppParameters::writeDefaultUDL() void NppParameters::writeDefaultUDL()
{ {
bool firstCleanDone = false; bool firstCleanDone = false;
std::vector<bool> deleteState;
for (auto udl : _pXmlUserLangsDoc) for (auto udl : _pXmlUserLangsDoc)
{ {
if (!_pXmlUserLangDoc) if (!_pXmlUserLangDoc)
{ {
_pXmlUserLangDoc = new TiXmlDocument(_userDefineLangPath); _pXmlUserLangDoc = new TiXmlDocument(_userDefineLangPath);
_pXmlUserLangDoc->InsertEndChild(TiXmlElement(TEXT("NotepadPlus")));
} }
bool toDelete = (udl._indexRange.second - udl._indexRange.first) == 0; bool toDelete = (udl._indexRange.second - udl._indexRange.first) == 0;
deleteState.push_back(toDelete);
if ((!udl._udlXmlDoc || udl._udlXmlDoc == _pXmlUserLangDoc) && udl._isDirty && !toDelete) // new created or/and imported UDL plus _pXmlUserLangDoc (if exist) if ((!udl._udlXmlDoc || udl._udlXmlDoc == _pXmlUserLangDoc) && udl._isDirty && !toDelete) // new created or/and imported UDL plus _pXmlUserLangDoc (if exist)
{ {
TiXmlNode *root = _pXmlUserLangDoc->FirstChild(TEXT("NotepadPlus")); TiXmlNode *root = _pXmlUserLangDoc->FirstChild(TEXT("NotepadPlus"));
@ -2915,17 +2918,28 @@ void NppParameters::writeDefaultUDL()
} }
} }
if (firstCleanDone) bool deleteAll = true;
for (bool del : deleteState)
{
if (!del)
{
deleteAll = false;
break;
}
}
if (firstCleanDone) // at least one udl is for saving, the udl to be deleted are ignored
{ {
_pXmlUserLangDoc->SaveFile(); _pXmlUserLangDoc->SaveFile();
} }
else else if (deleteAll)
{ {
if (::PathFileExists(_userDefineLangPath.c_str())) if (::PathFileExists(_userDefineLangPath.c_str()))
{ {
::DeleteFile(_userDefineLangPath.c_str()); ::DeleteFile(_userDefineLangPath.c_str());
} }
} }
// else nothing to change, do nothing
} }
void NppParameters::writeNonDefaultUDL() void NppParameters::writeNonDefaultUDL()