Bug 791613 - Taskbar shouldn't be migrated when installing silently. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 28 Sep 2012 15:45:26 -0700
changeset 108666 6e4ad6f5f8cf56e4904627c2a4209566c3cc2411
parent 108665 3f7638e3036f8b0623769e1eec7df208ba274751
child 108667 506dc963450ff8f91e1841e2c79c2b282f4f99e2
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersbbondy
bugs791613
milestone18.0a1
Bug 791613 - Taskbar shouldn't be migrated when installing silently. r=bbondy
browser/installer/windows/nsis/installer.nsi
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -542,21 +542,20 @@ Section "-InstallEndCleanup"
       ${GetOptions} "$0" "/UAC:" $0
       ${If} ${Errors}
         Call SetAsDefaultAppUserHKCU
       ${Else}
         GetFunctionAddress $0 SetAsDefaultAppUserHKCU
         UAC::ExecCodeSegment $0
       ${EndIf}
     ${EndIf}
+    ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).
+    ${MigrateTaskBarShortcut}
   ${EndUnless}
 
-  ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).
-  ${MigrateTaskBarShortcut}
-
   ${GetShortcutsLogPath} $0
   WriteIniStr "$0" "TASKBAR" "Migrated" "true"
 
   ; Refresh desktop icons
   System::Call "shell32::SHChangeNotify(i 0x08000000, i 0, i 0, i 0)"
 
   ${InstallEndCleanupCommon}