From 65c130a9a803eb40ea5d7510faef86aacb556e53 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Tue, 17 Feb 2015 18:55:00 -0800 Subject: Move prompt and processing the deletion of user settings to end of uninstall. --- indra/newview/installers/windows/installer_template.nsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 83c364ff7e..1d6bde0052 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -348,7 +348,7 @@ StrCpy $INSTEXE "${INSTEXE}" StrCpy $INSTSHORTCUT "${SHORTCUT}" # Make sure the user can install/uninstall -Call un.CheckIfAdministrator +Call un.CheckIfAdministrator # Uninstall for all users (if you change this, change it in the install as well) SetShellVarContext all @@ -370,13 +370,13 @@ Delete "$DESKTOP\$INSTSHORTCUT.lnk" Delete "$INSTDIR\$INSTSHORTCUT.lnk" Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" -# Clean up cache and log files, but leave them in-place for non AGNI installs. -Call un.UserSettingsFiles - # Remove the main installation directory Call un.ProgramFiles -SectionEnd +# Clean up cache and log files, but leave them in-place for non AGNI installs. +Call un.UserSettingsFiles + +SectionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Make sure the user can install @@ -734,7 +734,7 @@ FunctionEnd ; EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0 ; StrCmp $1 "" DONE # no more users ; -; ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" +; ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" ; StrCmp $2 "" CONTINUE 0 # "ProfileImagePath" value is missing ; ;# Required since ProfileImagePath is of type REG_EXPAND_SZ -- cgit v1.2.3