Bug 688615 - Wrong reg key used in Installer shell icon handler code, r=rob_strong, a=ehsan
authorFrank Wein <mcsmurf@mcsmurf.de>
Wed, 14 Dec 2011 22:38:33 +0100
changeset 82594 7e74a12601a4c078f87ae93c17c3e48b40db2596
parent 82593 5ef118dcf1a1455b0b2d0e0f78ad78c0d42fc458
child 82595 7cb2752fce12de7d9ab942f02c62b36809cb434d
push idunknown
push userunknown
push dateunknown
reviewersrob_strong, ehsan
bugs688615
milestone11.0a1
Bug 688615 - Wrong reg key used in Installer shell icon handler code, r=rob_strong, a=ehsan
browser/installer/windows/nsis/shared.nsh
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -389,17 +389,17 @@
 ; The IconHandler reference for FirefoxHTML can end up in an inconsistent state
 ; due to changes not being detected by the IconHandler for side by side
 ; installs (see bug 268512). The symptoms can be either an incorrect icon or no
 ; icon being displayed for files associated with Firefox (does not use SHCTX).
 !macro FixShellIconHandler
   ClearErrors
   ReadRegStr $1 HKLM "Software\Classes\FirefoxHTML\ShellEx\IconHandler" ""
   ${Unless} ${Errors}
-    ReadRegStr $1 HKLM "Software\Classes\FirefoxHTML\" ""
+    ReadRegStr $1 HKLM "Software\Classes\FirefoxHTML\DefaultIcon" ""
     ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
     ${If} "$1" != "$2,1"
       WriteRegStr HKLM "Software\Classes\FirefoxHTML\DefaultIcon" "" "$2,1"
     ${EndIf}
   ${EndUnless}
 !macroend
 !define FixShellIconHandler "!insertmacro FixShellIconHandler"