From 96110ed2612c15c0e2bb6109737b8ad189a7b60d Mon Sep 17 00:00:00 2001
From: Bruce Allen <bruce.allen@aei.mpg.de>
Date: Sun, 14 Aug 2005 00:13:39 +0000
Subject: [PATCH] fix: client gui now gives 'aborted by user' error message in
 the work pane.

svn path=/trunk/boinc/; revision=7319
---
 checkin_notes          | 4 ++++
 clientgui/Makefile.am  | 1 +
 clientgui/ViewWork.cpp | 7 +++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 702853c607..1983e85f50 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10554,9 +10554,13 @@ David  13 Aug 2005
 Bruce 13 Aug 2005
     - compile fixes for Mac OSX.  The autoconf/automake framework
       now works again to build client and clientgui.
+    - fix client gui now gives 'aborted by user' error message in
+      the work pane.
 
     client/
         Makefile.am
     clientgui/
         Makefile.am
         BOINCGUIApp.h
+        ViewWork.cpp
+
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 5008398a78..37d2de3007 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -51,6 +51,7 @@ boinc_gui_SOURCES = \
 EXTRA_DIST = *.h \
     res \
     msw \
+    ../lib/error_numbers.h \
     locale $(mac_headers)
 
 boinc_gui_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS)
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index b64f7240a4..dca564d295 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -28,7 +28,7 @@
 #include "BOINCListCtrl.h"
 #include "ViewWork.h"
 #include "Events.h"
-
+#include "../lib/error_numbers.h"
 
 #include "res/result.xpm"
 
@@ -677,7 +677,10 @@ wxInt32 CViewWork::FormatStatus(wxInt32 item, wxString& strBuffer) const {
             }
             break;
         case RESULT_COMPUTE_ERROR:
-            if (result->aborted_via_gui) {
+            // both tests below are needed, because the boolean flag is not changed
+            // right away
+            //
+            if (result->aborted_via_gui || result->exit_status == ERR_ABORTED_VIA_GUI) {
                 strBuffer = _("Aborted by user");
             } else {
                 strBuffer = _("Computation error");