Skip extra download of libiconv if SVN fails.

LongDirtyAnimAlf · Jul 21, 2021 · 20f70c0 · 20f70c0
1 parent 3095eca
commit 20f70c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/fpcupdeluxe.res b/fpcupdeluxe.res
diff --git a/installercore.pas b/installercore.pas
@@ -2274,19 +2274,18 @@ function TInstaller.DownloadBinUtils: boolean;
         end;
       end;
 
+      if (FUtilFiles[Counter].FileName='libiconv-2.dll') then continue;
+
       if (NOT DownloadSuccess) then
       begin
         Infoln(localinfotext+'Downloading: ' + FUtilFiles[Counter].FileName + ' with SVN failed. Now trying normal download.',etInfo);
         DownloadSuccess:=GetFile(FUtilFiles[Counter].RootURL + FUtilFiles[Counter].FileName,InstallPath+FUtilFiles[Counter].FileName);
       end;
 
-      if NOT DownloadSuccess then
+      if (NOT DownloadSuccess) then
       begin
-        //if (FUtilFiles[Counter].FileName<>'libiconv-2.dll') then
-        begin
-          Infoln(localinfotext+'Error downloading binutil: ' + FUtilFiles[Counter].FileName + ' into ' + ExtractFileDir(InstallPath) + '.',etError);
-          Inc(Errors);
-        end;
+        Infoln(localinfotext+'Error downloading binutil: ' + FUtilFiles[Counter].FileName + ' into ' + ExtractFileDir(InstallPath) + '.',etError);
+        Inc(Errors);
       end
       else
       begin