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 108557 6e4ad6f5f8cf56e4904627c2a4209566c3cc2411
parent 108556 3f7638e3036f8b0623769e1eec7df208ba274751
child 108558 506dc963450ff8f91e1841e2c79c2b282f4f99e2
push id23566
push userphilringnalda@gmail.com
push dateSat, 29 Sep 2012 05:10:54 +0000
treeherdermozilla-central@c09a0c022b2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs791613
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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}