From fe137a84c19e0a68f29288e9dba6c4b9969cd8c2 Mon Sep 17 00:00:00 2001 From: David Pinedo Date: Tue, 5 Apr 2016 16:40:08 -0600 Subject: [PATCH] winrtinstaller: fix install dir not being removed on uninstall. This problem was introduced when logging was added. --- windowsRuntimeInstaller/InstallerRT.nsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index c51c7cc..239634d 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -504,13 +504,14 @@ SectionEnd !ifdef UNINSTALLER Section "uninstall" - # Turn on logging - LogSet on - # Remove contents of temp dir SetOutPath "$TEMP\VulkanRT" RmDir /R "$TEMP\VulkanRT" + # Turn on logging + StrCpy $INSTDIR $TEMP\VulkanRT + LogSet on + # If running on a 64-bit OS machine, disable registry re-direct since we're running as a 32-bit executable. ${If} ${RunningX64} @@ -520,7 +521,6 @@ Section "uninstall" ${Endif} # Look up the install dir and remove files from that directory. - # We do this so that the uninstaller can be run from any directory. ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}${PRODUCTVERSION}" "InstallDir" StrCpy $IDir $0 @@ -657,7 +657,7 @@ Section "uninstall" # Finish logging and move log file to TEMP dir LogSet off - Rename "$INSTDIR\install.log" "$TEMP\VulkanRT\Uninstall.log" + Rename "$INSTDIR\install.log" "$INSTDIR\Uninstall.log" SectionEnd !endif -- 2.7.4