From a68805b7ff27717a367d19eb7ec9d1107c8dd81b Mon Sep 17 00:00:00 2001 From: Don HO Date: Thu, 31 Dec 2020 20:16:00 +0100 Subject: [PATCH] Make user defined overrideMap.xml not overridable during installation Fix https://community.notepad-plus-plus.org/topic/20534/notepad-v7-9-2-release-candidate-2/4?_=1609416552124 --- PowerEditor/installer/nsisInclude/functionList.nsh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/PowerEditor/installer/nsisInclude/functionList.nsh b/PowerEditor/installer/nsisInclude/functionList.nsh index 8b622f4a..775a150a 100644 --- a/PowerEditor/installer/nsisInclude/functionList.nsh +++ b/PowerEditor/installer/nsisInclude/functionList.nsh @@ -114,11 +114,6 @@ SectionGroup "Function List Files" functionListComponent File ".\functionList\krl.xml" ${MementoSectionEnd} - ${MementoSection} "Override Map" OverrideMap_FL - SetOutPath "$INSTDIR\functionList" - File ".\functionList\overrideMap.xml" - ${MementoSectionEnd} - ${MementoSection} "NSIS" NSIS_FL SetOutPath "$INSTDIR\functionList" File ".\functionList\nsis.xml" @@ -163,6 +158,12 @@ SectionGroup "Function List Files" functionListComponent SetOutPath "$INSTDIR\functionList" File ".\functionList\xml.xml" ${MementoSectionEnd} + + SetOverwrite off + ${MementoSection} "Override Map" OverrideMap_FL + SetOutPath "$INSTDIR\functionList" + File ".\functionList\overrideMap.xml" + ${MementoSectionEnd} SectionGroupEnd