From 048b4d5de1c7474b7ddfa34ec0076b1d5948b13f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 24 Sep 2020 07:34:20 +1000
Subject: [PATCH] fix(windows): bootstrap should skip install of failed
 downloads

---
 windows/src/desktop/setup/RunTools.pas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/windows/src/desktop/setup/RunTools.pas b/windows/src/desktop/setup/RunTools.pas
index 41f9437b36..8ab0a651c7 100644
--- a/windows/src/desktop/setup/RunTools.pas
+++ b/windows/src/desktop/setup/RunTools.pas
@@ -597,13 +597,16 @@ var
         packLocation := pack.GetBestLocation;
         if Assigned(packLocation) then
         begin
-          LogInfo('Downloading '+packLocation.Url);
           if packLocation.LocationType = iilOnline then
+          begin
+            LogInfo('Downloading '+packLocation.Url);
             if not TResourceDownloader.Execute(FInstallInfo, packLocation, FSilent) then
             begin
               LogInfo('Failed to download '+packLocation.Url); // TODO: can we get more detail?
+              pack.ShouldInstall := False;
               Continue; //
             end;
+          end;
 
           // Need to check kmshell version >= 14.0 for support for non-default
           // language registration into local machine context; will not install
@@ -632,7 +635,8 @@ var
       s := '-s -install-tips-for-packages ';
       for pack in FInstallInfo.Packages do
       begin
-        s := s + '"'+pack.ID+'='+pack.BCP47+'" ';
+        if pack.ShouldInstall then
+          s := s + '"'+pack.ID+'='+pack.BCP47+'" ';
       end;
 
       TUtilExecute.CreateProcessAsShellUser(FKMShellPath, '"'+FKMShellPath+'" '+s, True, FExitCode);