diff --git a/fpcupdeluxe.res b/fpcupdeluxe.res index 9f19c193..5b58aa4b 100644 Binary files a/fpcupdeluxe.res and b/fpcupdeluxe.res differ diff --git a/installercore.pas b/installercore.pas index c6049e06..d3f0e38b 100755 --- 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