Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-06-28 07:04:39 +08:00
commit 679eb8464d
4 changed files with 6506 additions and 4131 deletions

View file

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
4.2.1
4.3.0

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -5249,21 +5249,6 @@
StrCpy $AddStartMenuSC "1"
${EndIf}
ReadINIStr $R8 $R7 "Install" "TaskbarShortcut"
${If} $R8 == "false"
StrCpy $AddTaskbarSC "0"
${Else}
StrCpy $AddTaskbarSC "1"
${EndIf}
ReadINIStr $R8 $R7 "Install" "MaintenanceService"
${If} $R8 == "false"
StrCpy $InstallMaintenanceService "0"
${Else}
; Installing the service always requires elevation.
${ElevateUAC}
${EndIf}
!ifndef NO_STARTMENU_DIR
ReadINIStr $R8 $R7 "Install" "StartMenuDirectoryName"
${If} $R8 != ""