https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f31cf503fb5450dd60635…
commit f31cf503fb5450dd6063571412374a22754e0ca2
Author: Bișoc George <fraizeraust99(a)gmail.com>
AuthorDate: Sun Oct 14 16:07:51 2018 +0200
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Oct 21 13:10:12 2018 +0200
[APPWIZ] Do not display the message box if the user aborts the download
CORE-15183
---
dll/cpl/appwiz/addons.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c
index c2fb28d2ad..238348d0dc 100644
--- a/dll/cpl/appwiz/addons.c
+++ b/dll/cpl/appwiz/addons.c
@@ -362,10 +362,15 @@ static DWORD WINAPI download_proc(PVOID arg)
hres = URLDownloadToFileW(NULL, GeckoUrl, tmp_file, 0, &InstallCallback);
if(FAILED(hres)) {
- ERR("URLDownloadToFile failed: %08x\n", hres);
if (LoadStringW(hApplet, IDS_DWL_FAILED, message, sizeof(message) /
sizeof(WCHAR))) {
- MessageBoxW(NULL, message, NULL, MB_ICONERROR);
+ /* If the user aborted the download, DO NOT display the message box */
+ if (hres == E_ABORT) {
+ TRACE("Downloading of Gecko package aborted!\n");
+ } else {
+ MessageBoxW(NULL, message, NULL, MB_ICONERROR);
+ }
}
+ ERR("URLDownloadToFile failed: %08x\n", hres);
} else {
if(sha_check(tmp_file)) {
install_file(tmp_file);