From 61b8fc6ce534df7c54a4af5cb1539264a1c78b45 Mon Sep 17 00:00:00 2001
From: Matt Howell <mhowell@mozilla.com>
Date: Tue, 3 Oct 2017 13:18:21 -0700
Subject: [PATCH] Bug 1405438 - Make sure the stub installer exit code is
 initialized before the user can exit it. r=agashlin

Also make sure the download phase time is initialized, so it will always be
correct in affected pings.

MozReview-Commit-ID: 3aLHbMiRUZl
---
 browser/installer/windows/nsis/stub.nsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi
index 148aa332eac6..6ccc3227599e 100644
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -419,10 +419,13 @@ Function .onInit
 
   ; Initialize the majority of variables except those that need to be reset
   ; when a page is displayed.
+  StrCpy $ExitCode "${ERR_DOWNLOAD_CANCEL}"
   StrCpy $IntroPhaseSeconds "0"
   StrCpy $OptionsPhaseSeconds "0"
   StrCpy $EndPreInstallPhaseTickCount "0"
   StrCpy $EndInstallPhaseTickCount "0"
+  StrCpy $StartDownloadPhaseTickCount "0"
+  StrCpy $EndDownloadPhaseTickCount "0"
   StrCpy $InitialInstallRequirementsCode ""
   StrCpy $IsDownloadFinished ""
   StrCpy $FirefoxLaunchCode "0"
@@ -820,9 +823,7 @@ Function createInstall
   StrCpy $DownloadRetryCount "0"
   StrCpy $DownloadedBytes "0"
   StrCpy $StartLastDownloadTickCount ""
-  StrCpy $EndDownloadPhaseTickCount ""
   StrCpy $DownloadFirstTransferSeconds ""
-  StrCpy $ExitCode "${ERR_DOWNLOAD_CANCEL}"
   StrCpy $OpenedDownloadPage "0"
 
   ClearErrors
@@ -1171,7 +1172,6 @@ Function SendPing
     ; $EndFinishPhaseTickCount is used to determine how long the download was
     ; in progress.
     ${If} "$IsDownloadFinished" == "false"
-    ${OrIf} "$EndDownloadPhaseTickCount" == ""
       StrCpy $EndDownloadPhaseTickCount "$EndFinishPhaseTickCount"
       ; Cancel the download in progress
       InetBgDL::Get /RESET /END