From 874a0e00ced05969c2028148c30305830108ba34 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sat, 26 Jan 2013 13:22:08 +0200 Subject: [PATCH] Installed: Improved VC++ 2012 redistributable check --- Build/Installer/Installer.nsi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi index fc1fcb59..d720edf3 100644 --- a/Build/Installer/Installer.nsi +++ b/Build/Installer/Installer.nsi @@ -571,9 +571,15 @@ Section ${If} $InstallPortable <> 1 ; Download and install VC++ 2012 redist if required - ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Libraries\Extended\$InstArc" "Bld" + ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\$InstArc" "Bld" + ReadRegDWORD $2 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\$InstArc" "Installed" + ${If} $0 == "" + ; Some VS installs do not appear to have the "VC\Runtimes" node. + ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Libraries\Extended\$InstArc" "Bld" + ReadRegDWORD $2 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Libraries\Extended\$InstArc" "Install" + ${EndIf} + ${VersionCompare} "$0" "51106" $1 - ReadRegDWORD $2 HKLM "SOFTWARE\Microsoft\VisualStudio\11.0\VC\Libraries\Extended\$InstArc" "Install" ${If} $1 = 2 ${OrIf} $2 <> 1 ${If} ${Silent}