From ba5ca3a4630d2d4d3b7d26f289b93480e75d3ae7 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sun, 17 Mar 2019 18:51:58 +0000 Subject: [PATCH] Fixed InstallLib .NSI space-in-path script bug (bug #1222) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7092 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/history.but | 6 ++++-- Include/Library.nsh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Docs/src/history.but b/Docs/src/history.but index c74aab08..ca1f451e 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -16,12 +16,14 @@ ANSI targets are deprecated, consider moving to Unicode. \b Added \R{loadandsetimage}{LoadAndSetImage} -\b Fixed -O stderr stream issue (\W{http://sf.net/p/nsis/bugs/1221}{bug #1221}) - \b Allow quoted library path in System::Call (\W{http://sf.net/p/nsis/bugs/546}{bug #546}) \b %1 in !finalize command can be specified multiple times +\b Fixed -O stderr stream issue (\W{http://sf.net/p/nsis/bugs/1221}{bug #1221}) + +\b Fixed InstallLib .NSI space-in-path bug (\W{http://sf.net/p/nsis/bugs/1222}{bug #1222}) + \S2{} Translations diff --git a/Include/Library.nsh b/Include/Library.nsh index 41bcea65..56eed98c 100644 --- a/Include/Library.nsh +++ b/Include/Library.nsh @@ -148,8 +148,8 @@ !macro __InstallLib_Helper_CmpPackedVer64 oldhi oldlo newhi newlo jeq jle jgt - IntCmpU ${oldhi} ${newhi} 0 ${jle} ${jgt} - IntCmpU ${oldlo} ${newlo} ${jeq} ${jle} ${jgt} + IntCmpU ${oldhi} ${newhi} "0" "${jle}" "${jgt}" + IntCmpU ${oldlo} ${newlo} "${jeq}" "${jle}" "${jgt}" !macroend