Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 18:30:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not read launchClientNowState if client disabled

Browse source
This commit is contained in:
Atlante45 2016-11-16 13:15:10 -08:00
parent 9e0230980b
commit 2f2da8ccd3
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmake/templates/NSIS.template.in
View file

@ -503,7 +503,7 @@ Function ReadPostInstallOptions
${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState ${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState
${EndIf} ${EndIf}
${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
; check if we need to launch the client post-install ; check if we need to launch the client post-install
${NSD_GetState} $LaunchClientNowCheckbox $LaunchClientNowState ${NSD_GetState} $LaunchClientNowCheckbox $LaunchClientNowState
${EndIf} ${EndIf}
@ -580,20 +580,17 @@ Function HandlePostInstallOptions
${If} $LaunchServerNowState == ${BST_CHECKED} ${If} $LaunchServerNowState == ${BST_CHECKED}
!insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ; both launches use the explorer trick in case the user has elevated permissions for the installer
${If} $LaunchClientNowState == ${BST_CHECKED}
!insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
; create shortcut with ARGUMENTS ; create shortcut with ARGUMENTS
CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface"
; both launches use the explorer trick in case the user has elevated permissions for the installer Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"'
${If} $LaunchClientNowState == ${BST_CHECKED} ${Else}
!insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface" Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"'
Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"'
${Else}
!insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"'
${EndIf}
${EndIf} ${EndIf}
${Else} ${Else}
!insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO