summaryrefslogtreecommitdiffstats
path: root/application/palemoon/installer/windows/nsis/shared.nsh
diff options
context:
space:
mode:
Diffstat (limited to 'application/palemoon/installer/windows/nsis/shared.nsh')
-rw-r--r--application/palemoon/installer/windows/nsis/shared.nsh29
1 files changed, 10 insertions, 19 deletions
diff --git a/application/palemoon/installer/windows/nsis/shared.nsh b/application/palemoon/installer/windows/nsis/shared.nsh
index 815853ae7..385a411a3 100644
--- a/application/palemoon/installer/windows/nsis/shared.nsh
+++ b/application/palemoon/installer/windows/nsis/shared.nsh
@@ -322,11 +322,9 @@
WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML"
${EndIf}
- ${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".oga"
${AddAssociationIfNoneExist} ".ogg"
${AddAssociationIfNoneExist} ".ogv"
- ${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm"
; An empty string is used for the 5th param because PaleMoonHTML is not a
@@ -842,24 +840,17 @@
ClearErrors
WriteIniStr "$0" "TASKBAR" "Migrated" "true"
${If} ${AtLeastWin7}
- ; If we didn't run the stub installer, AddTaskbarSC will be empty.
- ; We determine whether to pin based on whether we're the default
- ; browser, or if we're on win8 or later, we always pin.
- ${If} $AddTaskbarSC == ""
- ; No need to check the default on Win8 and later
- ${If} ${AtMostWin2008R2}
- ; Check if the PaleMoon is the http handler for this user
- SetShellVarContext current ; Set SHCTX to the current user
- ${IsHandlerForInstallDir} "http" $R9
- ${If} $TmpVal == "HKLM"
- SetShellVarContext all ; Set SHCTX to all users
- ${EndIf}
- ${EndIf}
- ${If} "$R9" == "true"
- ${OrIf} ${AtLeastWin8}
- ${PinToTaskBar}
+ ; No need to check the default on Win8 and later
+ ${If} ${AtMostWin2008R2}
+ ; Check if the Pale Moon is the http handler for this user
+ SetShellVarContext current ; Set SHCTX to the current user
+ ${IsHandlerForInstallDir} "http" $R9
+ ${If} $TmpVal == "HKLM"
+ SetShellVarContext all ; Set SHCTX to all users
${EndIf}
- ${ElseIf} $AddTaskbarSC == "1"
+ ${EndIf}
+ ${If} "$R9" == "true"
+ ${OrIf} ${AtLeastWin8}
${PinToTaskBar}
${EndIf}
${EndIf}