Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-17 21:50:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix handling of not-present post install options

Browse source
This commit is contained in:
Stephen Birarda 2016-01-13 18:14:12 -08:00
parent 7a6c37aa2f
commit fef0c31fad
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -819,9 +819,15 @@ Var LAUNCH_NOW_CHECKBOX
Var CURRENT_OFFSET Var CURRENT_OFFSET
!macro SetPostInstallOption Checkbox OptionName Default !macro SetPostInstallOption Checkbox OptionName Default
; clear errors so we can detect if registry value is not present
ClearErrors
; reads the value for the given post install option to the registry ; reads the value for the given post install option to the registry
ReadRegDWORD $0 HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}" ReadRegDWORD $0 HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}"
; jump to UseDefault if no value found in the registry
IfErrors UseDefault 0
${If} $0 == "0" ${If} $0 == "0"
; the value in the registry says it should not be checked ; the value in the registry says it should not be checked
${NSD_SetState} ${Checkbox} ${BST_UNCHECKED} ${NSD_SetState} ${Checkbox} ${BST_UNCHECKED}
@ -829,10 +835,17 @@ Var CURRENT_OFFSET
; the value in the registry says it should be checked ; the value in the registry says it should be checked
${NSD_SetState} ${Checkbox} ${BST_CHECKED} ${NSD_SetState} ${Checkbox} ${BST_CHECKED}
${Else} ${Else}
; there was no value in the registry or it's not in the expected format, use default ; the value in the registry was not in the expected format, use default
${NSD_SetState} ${Checkbox} Default ${NSD_SetState} ${Checkbox} Default
${EndIf} ${EndIf}
Goto End
UseDefault:
; there was no value in the registry, use default
${NSD_SetState} ${Checkbox} Default
End:
!macroend !macroend
Function PostInstallOptionsPage Function PostInstallOptionsPage