From 1c7278832a79408ed488ddf60e5edd632f736073 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 13 May 2014 15:13:17 +0100
Subject: [PATCH] JAL-1239 cancelled flag should be checked and counted

---
 src/jalview/ws/JobStateSummary.java |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 13c70d3..35fb0fc 100644
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -75,6 +75,13 @@ public class JobStateSummary
   public void updateJobPanelState(WebserviceInfo wsInfo,
           String OutputHeader, AWsJob j)
   {
+    if (j.cancelled)
+    {
+        cancelled++;
+        j.subjobComplete=true;
+        wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK);
+        return;
+    } 
     if (j.submitted)
     {
       String progheader = "";
-- 
1.7.10.2