From c1954e5c447cdaaeb004315ed7db2c0cf29d764c Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 15 Aug 2024 18:48:14 +0200 Subject: [PATCH] Fix "User-defined keywords" not being saved properly (Style Config) When "User-defined keywords" field has been set keywords, removing all keywords then saving doesn't have any change (the keywords are kept after saving). The commit fix it. Fix #15543, fix #14303 --- PowerEditor/src/Parameters.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 9697cb4af1c0..ba58025f4e8d 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -8490,15 +8490,13 @@ void NppParameters::writeStyle2Element(const Style & style2Write, Style & style2 } - if (!style2Write._keywords.empty()) - { - TiXmlNode *teteDeNoeud = element->LastChild(); + TiXmlNode *teteDeNoeud = element->LastChild(); + + if (teteDeNoeud) + teteDeNoeud->SetValue(style2Write._keywords.c_str()); + else + element->InsertEndChild(TiXmlText(style2Write._keywords.c_str())); - if (teteDeNoeud) - teteDeNoeud->SetValue(style2Write._keywords.c_str()); - else - element->InsertEndChild(TiXmlText(style2Write._keywords.c_str())); - } } void NppParameters::insertUserLang2Tree(TiXmlNode *node, UserLangContainer *userLang)