Don't create server start menu shortcut if using Windows express install

This commit is contained in:
Kalila L 2021-03-07 21:03:30 -05:00
parent 6ad9113bcc
commit 9d7fa10092

View file

@ -251,8 +251,8 @@ Var substringResult
!macro InitSection SecName !macro InitSection SecName
; This macro reads component installed flag from the registry and ; This macro reads component installed flag from the registry and
;changes checked state of the section on the components page. ; changes checked state of the section on the components page.
;Input: section index constant name specified in Section command. ; Input: section index constant name specified in Section command.
ClearErrors ClearErrors
;Reading component status from registry ;Reading component status from registry
@ -718,7 +718,7 @@ Function InstallTypesPage
StrCpy $OffsetUnits u StrCpy $OffsetUnits u
StrCpy $Express "0" StrCpy $Express "0"
${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface and Vircadia Sandbox" ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface"
pop $ExpressInstallRadioButton pop $ExpressInstallRadioButton
${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
IntOp $CurrentOffset $CurrentOffset + 15 IntOp $CurrentOffset $CurrentOffset + 15
@ -1346,6 +1346,7 @@ Section "-Core installation"
${EndIf} ${EndIf}
${If} @SERVER_COMPONENT_CONDITIONAL@ ${If} @SERVER_COMPONENT_CONDITIONAL@
${AndIf} $Express == "0"
; handling for server console shortcut ; handling for server console shortcut
Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" \