diff --git a/checkin_notes b/checkin_notes index a56217bdf6..5051079191 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10544,3 +10544,9 @@ Rom 13 Aug 2005 BOINC.ism zlib/ + +David 13 Aug 2005 + - manager: fix result status in certain case (from Bruce Allen) + + clientgui + ViewWork.cpp diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 95edd646e8..b64f7240a4 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -677,7 +677,11 @@ wxInt32 CViewWork::FormatStatus(wxInt32 item, wxString& strBuffer) const { } break; case RESULT_COMPUTE_ERROR: - strBuffer = _("Computation error"); + if (result->aborted_via_gui) { + strBuffer = _("Aborted by user"); + } else { + strBuffer = _("Computation error"); + } break; case RESULT_FILES_UPLOADING: if (result->ready_to_report) {