From 6bd89cc4c7e1debfb6123275f1b2c2c08210e62f Mon Sep 17 00:00:00 2001 From: anders_k Date: Mon, 23 May 2016 23:52:30 +0000 Subject: [PATCH] Hopefully fixed reported issue where the LogicLib EndSelectLabel is not found when using ${Case2} in nested ${Select}s git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6752 212acab6-be3b-0410-9dea-997c60f758d6 --- Include/LogicLib.nsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Include/LogicLib.nsh b/Include/LogicLib.nsh index cab15b4b..fd021559 100644 --- a/Include/LogicLib.nsh +++ b/Include/LogicLib.nsh @@ -664,7 +664,7 @@ !error "Cannot use Case following a CaseElse" !endif Goto ${${_Logic}EndSelect} ; Go to EndSelect (Ends the previous Case) - !define /IfNDef _LogicLib_EndSelectLabelUsed + !define /IfNDef _LogicLib_EndSelectLabelUsed_${_Logic} ${${_Logic}Else}: ; Place the Else label !undef ${_Logic}Else ; and remove it !else @@ -753,9 +753,9 @@ !undef ${_Logic}Else ; and remove it !endif !ifdef ${_Logic}EndSelect ; This won't be set if there weren't any cases - !ifdef _LogicLib_EndSelectLabelUsed ; There is no jump to ${${_Logic}EndSelect}: if there is only one Case + !ifdef _LogicLib_EndSelectLabelUsed_${_Logic} ; There is no jump to ${${_Logic}EndSelect}: if there is only one Case ${${_Logic}EndSelect}: ; Place the EndSelect - !undef _LogicLib_EndSelectLabelUsed + !undef _LogicLib_EndSelectLabelUsed_${_Logic} !endif !undef ${_Logic}EndSelect ; and remove it !endif