X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=5a9f62fe9433cf702c96f92ed0abae329f52a662;hp=1a315063fd14a8036e8b8fddb76d90833b266f15;hb=da79b59082e749f9a9f40fd9805da5c81d34c4f3;hpb=cd6fda1153b27b8f1df87110c93a51c53f0655ea;ds=sidebyside

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 1a31506..5a9f62f 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -5,10 +5,6 @@
 !include EnvVarUpdate.nsh
 !include version.nsi
 
-; !define VS_REDIST_EXE "vcredist_x86.exe"
-; !define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\${VS_REDIST_EXE}"
-; !define VS_REDIST_KEY "SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86"
-
 !include "MUI.nsh"
 
 SetCompressor bzip2
@@ -87,10 +83,10 @@ Section "YAZ Runtime" YAZ_Runtime
 	SetOutPath $INSTDIR\bin
 !if "${VS_REDIST_FULL}" != ""
 	File "${VS_REDIST_FULL}"
-	ReadRegStr $1 HKLM "${VS_REDIST_KEY}" "Installed"
-	StrCmp $1 1 installed_redist
-	ExecWait '"$INSTDIR\bin\${VS_REDIST_EXE}" /passive /nostart'
-installed_redist:
+	ReadRegDword $1 HKLM "${VS_REDIST_KEY}" "Version"
+	${If} $1 == ""
+	  ExecWait '"$INSTDIR\bin\${VS_REDIST_EXE}" /passive /nostart'
+	${endif}
 	Delete "$INSTDIR\bin\${VS_REDIST_EXE}"
 !endif
 	IfFileExists "$INSTDIR\bin\yaz-ztest.exe" 0 Noservice