diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 17:49:30 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 17:49:30 -0600 |
| commit | ce4c8a8ad57515e851207b0a82f3af791bb30d3e (patch) | |
| tree | cf75db070a6184605081645dcfa456724e386014 | |
| parent | aa9630c30ee09bf358e77bf47ed0815a19237fca (diff) | |
| parent | 320e312db36fb6519a0bb1530d79595af18cdc86 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
| -rw-r--r-- | altosui/Instdrv/NSIS/Includes/java.nsh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/altosui/Instdrv/NSIS/Includes/java.nsh b/altosui/Instdrv/NSIS/Includes/java.nsh index a457562b..8e0e208a 100644 --- a/altosui/Instdrv/NSIS/Includes/java.nsh +++ b/altosui/Instdrv/NSIS/Includes/java.nsh @@ -56,14 +56,29 @@ Function openLinkNewWindow Exch Push $0 Exch - - ReadRegStr $0 HKCR "http\shell\open\command" "" + + ReadRegStr $1 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.html\UserChoice" "Progid" + IfErrors iexplore + + Goto foundbrowser +iexplore: + StrCpy $1 "IE.AssocFile.HTM" + +foundbrowser: + + StrCpy $2 "\shell\open\command" + + StrCpy $3 $1$2 + + ReadRegStr $0 HKCR $3 "" + # Get browser path - DetailPrint $0 + DetailPrint $0 + StrCpy $2 '"' StrCpy $1 $0 1 StrCmp $1 $2 +2 # if path is not enclosed in " look for space as final char - StrCpy $2 ' ' + StrCpy $2 ' ' StrCpy $3 1 loop: StrCpy $1 $0 1 $3 |