Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 21:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #596 from kasenvr/fix/nsis-auto-sandbox-launch

Browse source 
NSIS: uncheck by default sandbox autostart
This commit is contained in:
kasenvr 2020-08-06 21:54:35 -04:00 committed by GitHub
commit a80ddeabb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -871,7 +871,7 @@ Function PostInstallOptionsPage
Pop $LaunchConsoleNowCheckbox Pop $LaunchConsoleNowCheckbox
; set the checkbox state depending on what is present in the registry ; set the checkbox state depending on what is present in the registry
!insertmacro SetInstallOption $LaunchConsoleNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED} !insertmacro SetInstallOption $LaunchConsoleNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_UNCHECKED}
${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
${IfNot} $substringResult == "" ${IfNot} $substringResult == ""
${NSD_SetState} $LaunchConsoleNowCheckbox ${BST_UNCHECKED} ${NSD_SetState} $LaunchConsoleNowCheckbox ${BST_UNCHECKED}
@ -887,7 +887,7 @@ Function PostInstallOptionsPage
IntOp $CurrentOffset $CurrentOffset + 15 IntOp $CurrentOffset $CurrentOffset + 15
; set the checkbox state depending on what is present in the registry ; set the checkbox state depending on what is present in the registry
!insertmacro SetInstallOption $ConsoleStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED} !insertmacro SetInstallOption $ConsoleStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_UNCHECKED}
${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)" ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)"
Pop $CleanInstallCheckbox Pop $CleanInstallCheckbox
@ -940,8 +940,8 @@ Function ReadInstallTypes
StrCpy $Express "1" StrCpy $Express "1"
StrCpy $DesktopClientState ${BST_CHECKED} StrCpy $DesktopClientState ${BST_CHECKED}
StrCpy $ConsoleStartupState ${BST_CHECKED} StrCpy $ConsoleStartupState ${BST_UNCHECKED}
StrCpy $LaunchConsoleNowState ${BST_CHECKED} StrCpy $LaunchConsoleNowState ${BST_UNCHECKED}
StrCpy $LaunchClientNowState ${BST_CHECKED} StrCpy $LaunchClientNowState ${BST_CHECKED}
StrCpy $CleanInstallState ${BST_UNCHECKED} StrCpy $CleanInstallState ${BST_UNCHECKED}
StrCpy $DesktopConsoleState ${BST_UNCHECKED} StrCpy $DesktopConsoleState ${BST_UNCHECKED}