From bc444d4b1f1a98b2cca99bc4e05e6bb7a44818e2 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sat, 25 Apr 2015 23:08:50 +0200 Subject: [PATCH] Issue #713,#807 Installer for 4.0 fails to access Adobe Website --- installer.nsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/installer.nsi b/installer.nsi index 82e6ef343..a176f5ce5 100644 --- a/installer.nsi +++ b/installer.nsi @@ -753,23 +753,23 @@ var pos var pgfound var f var pgname +var pghtml Section "Download PlayerGlobal.swc" SecPlayerGlobal checkadobe: DetailPrint "Checking Adobe site for newest PlayerGlobal.swc file" -!tempfile PGHTML -MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP "XXX tempfile: ${PGHTML})" /SD IDIGNORE IDRETRY checkadobe IDIGNORE exit -inetc::get /SILENT /USERAGENT "${APP_NAME} Setup" "https://www.adobe.com/support/flashplayer/downloads.html" "${PGHTML}" +GetTempFileName $pghtml +inetc::get /SILENT /USERAGENT "${APP_NAME} Setup" "https://www.adobe.com/support/flashplayer/downloads.html" "$pghtml" Pop $0 StrCmp $0 "OK" dlok MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP "PlayerGlobal.SWC was not found on Adobe webpages. You can download it later manually." /SD IDIGNORE IDRETRY checkadobe IDIGNORE exit -;MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP "PlayerGlobal.SWC was not found on Adobe webpages. You can download it later manually. (Error returned was: $0, tempfile: ${PGHTML})" /SD IDIGNORE IDRETRY checkadobe IDIGNORE exit +;MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP "PlayerGlobal.SWC was not found on Adobe webpages. You can download it later manually. (Error returned was: $0, tempfile: $pghtml)" /SD IDIGNORE IDRETRY checkadobe IDIGNORE exit Abort dlok: StrCpy $pgfound 0 -FileOpen $f "${PGHTML}" r +FileOpen $f "$pghtml" r loop: FileRead $f $txt IfErrors done