Bug 740233 - fix for application id query bug in toolkit nsis scripts. r=rstrong a=lsblakk
authorJim Mathies <jmathies@mozilla.com>
Fri, 01 Jun 2012 07:06:26 -0500
changeset 95927 e9efce4842b8b71847bf33d729f236ec2ca52e7e
parent 95926 540694f5df42647a31f01cbea75ecc3d6e17acae
child 95928 c3bbe64f1d376beaa1f31b9d3648e7e883c28135
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, lsblakk
bugs740233
milestone14.0a2
Bug 740233 - fix for application id query bug in toolkit nsis scripts. r=rstrong a=lsblakk
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -6932,22 +6932,26 @@
             Pop $AppUserModelID
             ${If} $AppUserModelID == "error"
               GoTo end
             ${EndIf}
             ClearErrors
             WriteRegStr HKLM "$R8" "$R9" "$AppUserModelID"
             ${If} ${Errors}
               ClearErrors
-              WriteRegStr HKLM "$R8" "$R9" "$AppUserModelID"
+              WriteRegStr HKCU "$R8" "$R9" "$AppUserModelID"
               ${If} ${Errors}
                 StrCpy $AppUserModelID "error"
               ${EndIf}
             ${EndIf}
+          ${Else}
+            StrCpy $AppUserModelID $R7
           ${EndIf}
+        ${Else}
+          StrCpy $AppUserModelID $R7
         ${EndIf}
       ${EndIf}
 
       end:
       ${If} "$AppUserModelID" == "error"
         StrCpy $AppUserModelID ""
       ${EndIf}