From fa09db746a50f29faaae91abce7b949ce50142de Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 17 Oct 2023 22:40:17 +0300 Subject: SL-20441 Do not recreate desktop shortcut when updating --- indra/newview/installers/windows/installer_template.nsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index ed37f541c8..7a1196bb34 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -398,8 +398,18 @@ CreateShortCut "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \ # Other shortcuts SetOutPath "$INSTDIR" -CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \ + +Push $0 +${GetParameters} $COMMANDLINE +${GetOptionsS} $COMMANDLINE "/marker" $0 +# Returns error if option does not exist +IfErrors 0 DESKTOP_SHORTCUT_DONE + # "/marker" is set by updater, do not recreate desktop shortcut + CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \ "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE" + +DESKTOP_SHORTCUT_DONE: +Pop $0 CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \ "$INSTDIR\$VIEWER_EXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE" CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \ -- cgit v1.2.3