From fd8cdfd4a2cfd56bd305dde5fb313ee9a28ef87e Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 22 Mar 2017 15:05:13 +0000 Subject: [PATCH] Fix MUI dependencies check when Languages or Graphics are not installed git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6842 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/makensis.nsi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 7ef61f42..3a47f449 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -497,11 +497,10 @@ ${MementoSection} "Language Files" SecLangFiles SetOutPath $INSTDIR\Bin File ..\Bin\MakeLangID.exe - !insertmacro SectionFlagIsSet ${SecInterfacesModernUI} ${SF_SELECTED} mui nomui - mui: + ${If} ${SectionIsSelected} ${SecInterfacesModernUI} SetOutPath "$INSTDIR\Contrib\Language files" File "..\Contrib\Language files\*.nsh" - nomui: + ${EndIf} ${MementoSectionEnd} @@ -787,13 +786,13 @@ Section -post DetailPrint "Configuring Modern UI..." SetDetailsPrint listonly - ${If} ${SectionIsSelected} ${SecLangFiles} + ${IfNot} ${SectionIsSelected} ${SecLangFiles} SetOutPath "$INSTDIR\Contrib\Language files" File "..\Contrib\Language files\English.nlf" File "..\Contrib\Language files\English.nsh" ${EndIf} - ${If} ${SectionIsSelected} ${SecGraphics} + ${IfNot} ${SectionIsSelected} ${SecGraphics} SetOutPath $INSTDIR\Contrib\Graphics\Checks File "..\Contrib\Graphics\Checks\modern.bmp" SetOutPath $INSTDIR\Contrib\Graphics\Icons