From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 3 Oct 2014 11:01:34 +0000 (+0100)
Subject: JAL-1506 correct exit on close align frame
X-Git-Tag: Jalview_2_9~169^2~22^2~24
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=27c019af21a3eddef893d67fcf27c70f33720a06;p=jalview.git

JAL-1506 correct exit on close align frame
---

diff --git a/src/jalview/workers/ConsensusThread.java b/src/jalview/workers/ConsensusThread.java
index 69bdd24..c754ee3 100644
--- a/src/jalview/workers/ConsensusThread.java
+++ b/src/jalview/workers/ConsensusThread.java
@@ -79,6 +79,7 @@ public class ConsensusThread extends AlignCalcWorker implements
       if (alignViewport.isClosed())
       {
         abortAndDestroy();
+        return;
       }
       AlignmentI alignment = alignViewport.getAlignment();
 
diff --git a/src/jalview/workers/ConservationThread.java b/src/jalview/workers/ConservationThread.java
index 7ed50d8..a7180a0 100644
--- a/src/jalview/workers/ConservationThread.java
+++ b/src/jalview/workers/ConservationThread.java
@@ -20,16 +20,16 @@
  */
 package jalview.workers;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import jalview.analysis.Conservation;
 import jalview.api.AlignCalcWorkerI;
-import jalview.api.AlignmentViewPanel;
 import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ConservationThread extends AlignCalcWorker implements
         AlignCalcWorkerI
 {
@@ -74,6 +74,7 @@ public class ConservationThread extends AlignCalcWorker implements
       if (alignViewport.isClosed())
       {
         abortAndDestroy();
+        return;
       }
       List<AlignmentAnnotation> ourAnnot = new ArrayList<AlignmentAnnotation>();
       AlignmentI alignment = alignViewport.getAlignment();
diff --git a/src/jalview/workers/StrucConsensusThread.java b/src/jalview/workers/StrucConsensusThread.java
index 72d26ff..3230a36 100644
--- a/src/jalview/workers/StrucConsensusThread.java
+++ b/src/jalview/workers/StrucConsensusThread.java
@@ -20,8 +20,6 @@
  */
 package jalview.workers;
 
-import java.util.Hashtable;
-
 import jalview.analysis.StructureFrequency;
 import jalview.api.AlignCalcWorkerI;
 import jalview.api.AlignViewportI;
@@ -31,6 +29,8 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
 import jalview.datamodel.SequenceI;
 
+import java.util.Hashtable;
+
 public class StrucConsensusThread extends AlignCalcWorker implements
         AlignCalcWorkerI
 {
@@ -74,6 +74,7 @@ public class StrucConsensusThread extends AlignCalcWorker implements
       if (alignViewport.isClosed())
       {
         abortAndDestroy();
+        return;
       }
       AlignmentI alignment = alignViewport.getAlignment();