From d779a03f0bee51110a30a52eecc352f5074fa30a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 6 Feb 2019 09:17:06 -0500 Subject: SL-10469: Add diagnostic popup when trying to delete old shortcuts. --- .../installers/windows/installer_template.nsi | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 8af0f057ae..6bf4dba142 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -611,6 +611,32 @@ Delete "$INSTDIR\releasenotes.txt" # any such old shortcuts. SetShellVarContext current +Push $0 # FindFirst context +Push $1 # FindFirst/FindNext filename +Push $2 # cumulative filenames + +StrCpy $2 "Checking $SMPROGRAMS\$INSTSHORTCUT$\nAbout to delete:" + +ClearErrors +FindFirst $0 $1 "$SMPROGRAMS\$INSTSHORTCUT\*.*" +loop: +IfErrors done + StrCpy $2 "$2$\n$SMPROGRAMS\$INSTSHORTCUT\$1" + FindNext $0 $1 + Goto loop +done: +FindClose $0 + +StrCpy $2 "$2$\n$\nChecking $DESKTOP\$INSTSHORTCUT.lnk" +IfFileExists "$DESKTOP\$INSTSHORTCUT.lnk" 0 +2 +StrCpy $2 "$2$\n$DESKTOP\$INSTSHORTCUT.lnk" + +MessageBox MB_OK "$2" + +Pop $2 +Pop $1 +Pop $0 + # This stanza should match the $SMPROGRAMS and $DESKTOP deletions in the # "clean up shortcuts" passage in Section Uninstall. Don't bother with the # shortcuts in $INSTDIR because we're just about to (over)write those. -- cgit v1.2.3