Comment only change - Bug 460698 - Confusing undocumented code in uninstaller.nsi - un.leaveWelcome. r=me
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 20 Oct 2008 12:08:26 -0700
changeset 20678 0e117ce1b61041bd6837fcc87a1add175a50815b
parent 20677 9aaaa61cc0613f8b5f3ebbf44b358ab5d6a9c33c
child 20679 489b5d339c202875b6995fa116aa1a1673fd7503
push id3053
push userrstrong@mozilla.com
push dateMon, 20 Oct 2008 19:09:43 +0000
treeherdermozilla-central@0e117ce1b610 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs460698
milestone1.9.1b2pre
Comment only change - Bug 460698 - Confusing undocumented code in uninstaller.nsi - un.leaveWelcome. r=me
browser/installer/windows/nsis/uninstaller.nsi
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -378,29 +378,36 @@ Function un.preWelcome
     CopyFiles /SILENT "$INSTDIR\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp"
   ${EndIf}
 FunctionEnd
 
 Function un.leaveWelcome
   ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
     Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)"
 
+    ; If the message window has been found previously give the app an additional
+    ; five seconds to close.
     ${If} "$TmpVal" == "FoundMessageWindow"
       Sleep 5000
     ${EndIf}
 
     ${PushFilesToCheck}
 
     ${un.CheckForFilesInUse} $TmpVal
 
     Banner::destroy
 
+    ; If there are files in use $TmpVal will be "true"
     ${If} "$TmpVal" == "true"
+      ; If the message window is found the call to ManualCloseAppPrompt will
+      ; abort leaving the value of $TmpVal set to "FoundMessageWindow".
       StrCpy $TmpVal "FoundMessageWindow"
       ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
+      ; If the message window is not found set $TmpVal to "true" so the restart
+      ; required message is displayed.
       StrCpy $TmpVal "true"
     ${EndIf}
   ${EndIf}
 FunctionEnd
 
 Function un.preConfirm
   ${If} ${FileExists} "$INSTDIR\distribution\modern-header.bmp"
   ${AndIf} $hHeaderBitmap == ""