Attribute and put fix in section.

git-svn-id: file:///svn/unbound/trunk@4799 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 58b60adad5487e4c05eabbd1687c4be751a2fb93..3006d53fb9a16b5c01eace84df5119030e235f70 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,6 @@
 26 July 2018: Wouter
        - Fix #4135: 64-bit Windows Installer Creates Entries Under The
-         Wrong Registry Key.
+         Wrong Registry Key, reported by Brian White.
 
 23 July 2018: Wouter
        - Fix use-systemd readiness signalling, only when use-systemd is yes

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index ceb5c2b4ab26d63aad353e4fe1cd579f3ca4de5b..886d83a99929470eab346351ff26cac8d02dd607 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -14,7 +14,6 @@ outFile "unbound_setup_${VERSION}.exe"
 Name "Unbound"
 
 # default install directory
-SetRegView 64
 installDir "$PROGRAMFILES64\Unbound"
 installDirRegKey HKLM "Software\Unbound" "InstallLocation"
 RequestExecutionLevel admin
@@ -80,6 +79,7 @@ sectionEnd
 
 section "-hidden.postinstall"
        # copy files
+       SetRegView 64
        setOutPath $INSTDIR
        File "..\LICENSE"
        File "README.txt"
@@ -173,6 +173,7 @@ LangString DESC_rootkey ${LANG_ENGLISH} "Set up to use the DNSSEC root trust anc
 
 # uninstaller section
 section "un.Unbound"
+       SetRegView 64
        # stop unbound service
        nsExec::ExecToLog '"$INSTDIR\unbound-service-remove.exe" stop'
        Pop $0 # return value/error/timeout