From 545717ad8a7eb6879d13c1c00ec5329c5f41d1af Mon Sep 17 00:00:00 2001 From: "sgehani%netscape.com" Date: Fri, 22 Sep 2000 02:23:54 +0000 Subject: [PATCH] Throw up an error dialog and stop if any zippy errors detected. [nsbeta3+ b=34014; r=ssu; a=syd] --- xpinstall/wizard/mac/src/MacInstallWizard.c | 2 +- xpinstall/wizard/mac/src/XPInstallGlue.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xpinstall/wizard/mac/src/MacInstallWizard.c b/xpinstall/wizard/mac/src/MacInstallWizard.c index 9f5f7892324..477285cfd46 100644 --- a/xpinstall/wizard/mac/src/MacInstallWizard.c +++ b/xpinstall/wizard/mac/src/MacInstallWizard.c @@ -383,7 +383,7 @@ void ErrorHandler(short errCode) } else { - pstrcpy(pMessage, "\pSystem error: "); + pstrcpy(pMessage, "\pInstallation failed due to error: "); pstrcat(pMessage, pErrNo); } diff --git a/xpinstall/wizard/mac/src/XPInstallGlue.c b/xpinstall/wizard/mac/src/XPInstallGlue.c index 992a718068d..8f9fe287a99 100644 --- a/xpinstall/wizard/mac/src/XPInstallGlue.c +++ b/xpinstall/wizard/mac/src/XPInstallGlue.c @@ -301,7 +301,9 @@ RunAllXPIs(short xpiVRefNum, long xpiDirID, short vRefNum, long dirID) HUnlock(gControls->cfg->comp[i].shortDesc); } - RunXPI(xpiSpec, &xpi_installProc); + err = RunXPI(xpiSpec, &xpi_installProc); + if (err != NS_OK) + break; // update progess bar if (gControls->tw->allProgressBar) @@ -334,7 +336,7 @@ RunXPI(FSSpec& aXPI, XPI_InstallProc *xpi_installProc) long flags = 0x1000; /* XPI_NO_NEW_THREAD = 0x1000 from nsISoftwareUpdate.h */ Boolean indeterminateFlag = true; - rv = (*xpi_installProc)( aXPI, "", flags ); + XPI_ERR_CHECK((*xpi_installProc)( aXPI, "", flags )); /* reset progress bar to barber poll */ bMaxDiscovered = false;