Added "abort" to progress states, so user cancellations can be reported

properly.
This commit is contained in:
Andy McFadden 2003-02-08 22:19:50 +00:00
parent 6f418b9d5c
commit dbf47b585f
2 changed files with 4 additions and 1 deletions

View File

@ -1530,7 +1530,8 @@ Nu_ExpandLZW(NuArchive* pArchive, const NuRecord* pRecord,
/* write the data, possibly doing an EOL conversion */
err = Nu_FunnelWrite(pArchive, pFunnel, writeBuf, writeLen);
if (err != kNuErrNone) {
Nu_ReportError(NU_BLOB, err, "unable to write output");
if (err != kNuErrAborted)
Nu_ReportError(NU_BLOB, err, "unable to write output");
goto bail;
}

View File

@ -748,6 +748,8 @@ bail:
/* send a final progress message, indicating failure */
if (err == kNuErrSkipped)
pProgressData->state = kNuProgressSkipped;
else if (err == kNuErrAborted)
pProgressData->state = kNuProgressAborted;
else
pProgressData->state = kNuProgressFailed;
(void) Nu_SendInitialProgress(pArchive, pProgressData);