diff options
| author | David Pinedo <david@lunarg.com> | 2016-04-05 16:40:08 -0600 |
|---|---|---|
| committer | David Pinedo <david@lunarg.com> | 2016-04-05 16:44:11 -0600 |
| commit | fe137a84c19e0a68f29288e9dba6c4b9969cd8c2 (patch) | |
| tree | 4ed172bff27c08d54d3f434485f76de28f8bbc5b /windowsRuntimeInstaller | |
| parent | 7debf4bfcd273816818f7266dd50c8c30c4425ca (diff) | |
| download | usermoji-fe137a84c19e0a68f29288e9dba6c4b9969cd8c2.tar.xz | |
winrtinstaller: fix install dir not being removed on uninstall.
This problem was introduced when logging was added.
Diffstat (limited to 'windowsRuntimeInstaller')
| -rw-r--r-- | windowsRuntimeInstaller/InstallerRT.nsi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index c51c7cc6..239634d0 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 |