livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: bd12d1ab1943 - MAINT-3591 Remove "Start Second Life now?" dialogue...

meow-7.2.2
Tank_Master 2015-02-12 14:34:44 -08:00
parent 68c94399ed
commit b0d01b0a0a
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/installers/windows/installer_template.nsi
View File

@ -123,8 +123,24 @@ Var DO_UNINSTALL_V2 # If non-null, path to a previous Viewer 2 installation
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
Push $R0 # Option value, unused
StrCmp $SKIP_DIALOGS "true" label_launch
${GetOptions} $COMMANDLINE "/AUTOSTART" $R0
# If parameter was there (no error) just launch
# Otherwise ask
IfErrors label_ask_launch label_launch
label_ask_launch:
# Don't launch by default when silent
IfSilent label_no_launch
MessageBox MB_YESNO $(InstSuccesssQuestion) \
IDYES label_launch IDNO label_no_launch
label_launch:
# Assumes SetOutPath $INSTDIR
Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'
label_no_launch:
Pop $R0
FunctionEnd