From eb8bb52e9ba6a904cb55c79410b92c02f944eb74 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 13 Aug 2005 17:53:51 +0000
Subject: [PATCH] result status label

svn path=/trunk/boinc/; revision=7314
---
 checkin_notes          | 6 ++++++
 clientgui/ViewWork.cpp | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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/
         <A Bunch of files>
+
+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) {