From c91b657a4004f18da921a662f9cc035707ac4bab Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 26 Jul 2018 07:10:24 +0000
Subject: [PATCH] Attribute and put fix in section.

git-svn-id: file:///svn/unbound/trunk@4799 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog   | 2 +-
 winrc/setup.nsi | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 58b60adad..3006d53fb 100644
--- 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 ceb5c2b4a..886d83a99 100644
--- 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